Thread: [FOray-commit] SF.net SVN: foray: [7155] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2006-05-08 17:56:41
|
Revision: 7155 Author: victormote Date: 2006-05-06 16:06:09 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7155&view=rev Log Message: ----------- Add new package skeleton for generic layout classes. Added Paths: ----------- trunk/foray/foray-layout/ trunk/foray/foray-layout/.checkstyle trunk/foray/foray-layout/.project trunk/foray/foray-layout/scripts/ trunk/foray/foray-layout/scripts/build.bat trunk/foray/foray-layout/scripts/build.sh trunk/foray/foray-layout/scripts/build.xml trunk/foray/foray-layout/src/ trunk/foray/foray-layout/src/java/ trunk/foray/foray-layout/src/java/org/ trunk/foray/foray-layout/src/java/org/foray/ trunk/foray/foray-layout/src/java/org/foray/layout/ trunk/foray/foray-layout/src/java/org/foray/layout/package.html Added: trunk/foray/foray-layout/.checkstyle =================================================================== --- trunk/foray/foray-layout/.checkstyle (rev 0) +++ trunk/foray/foray-layout/.checkstyle 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-layout/.project =================================================================== --- trunk/foray/foray-layout/.project (rev 0) +++ trunk/foray/foray-layout/.project 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>FOrayLayout</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + </natures> +</projectDescription> Added: trunk/foray/foray-layout/scripts/build.bat =================================================================== --- trunk/foray/foray-layout/scripts/build.bat (rev 0) +++ trunk/foray/foray-layout/scripts/build.bat 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,27 @@ +@echo off + +echo "FOray Build System" +echo "------------------" + +IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR +IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR + +call %ANT_HOME%\bin\ant.bat %* + +GOTO END + +:JAVA_HOME_ERR + echo ERROR: JAVA_HOME not found in your environment. + echo + echo Please set the JAVA_HOME variable in your environment to match the + echo location of the Java Virtual Machine you want to use. +GOTO END + +:ANT_HOME_ERR + echo ERROR: ANT_HOME not found in your environment. + echo + echo Please set the ANT_HOME variable in your environment to match the + echo location of the root of your ANT installation. +GOTO END + +:END Added: trunk/foray/foray-layout/scripts/build.sh =================================================================== --- trunk/foray/foray-layout/scripts/build.sh (rev 0) +++ trunk/foray/foray-layout/scripts/build.sh 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,29 @@ +#!/bin/sh + +# This file must be executable. + +echo +echo "FOray Build System" +echo "------------------" + +if [ "$JAVA_HOME" = "" ] +then + echo "ERROR: JAVA_HOME not found in your environment." + echo + echo "Please set the JAVA_HOME variable in your environment to match the" + echo "location of the Java Virtual Machine you want to use." + exit 1 +fi + +if [ "$ANT_HOME" = "" ] +then + echo "ERROR: ANT_HOME not found in your environment." + echo + echo "Please set the ANT_HOME variable in your environment to match the" + echo "location of the root of your ANT installation." + exit 1 +fi + +"$ANT_HOME"/bin/ant "$@" + +##### Last Line of $RCSfile$ ##### Property changes on: trunk/foray/foray-layout/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-layout/scripts/build.xml =================================================================== --- trunk/foray/foray-layout/scripts/build.xml (rev 0) +++ trunk/foray/foray-layout/scripts/build.xml 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,173 @@ +<?xml version="1.0"?> +<!-- $Id$ --> + +<project default="package" basedir="."> + + <!-- Set up a prefix to designate environment variables. --> + <property environment="env"/> + + <target name="env"> + <!-- If the environment variable FORAY_CONFIG is set, use it. --> + <condition property="foray.config" value="${env.FORAY_CONFIG}"> + <and> + <isset property="env.FORAY_CONFIG"/> + <available file="${env.FORAY_CONFIG}"/> + </and> + </condition> + <!-- Otherwise, set it to the FOray scripts directory. --> + <property name="foray.config" location="../../scripts"/> + <echo>foray.config: ${foray.config}</echo> + + <!-- Retrieve externally-configured properties. --> + <property file="${foray.config}/foray-build.properties"/> + + <!-- Get a default for {foray.home}. --> + <property name="foray.home" location="../.."/> + <echo>foray.home: ${foray.home}</echo> + + <!-- Set up dependent properties. --> + <property name="lib.dir" location="${foray.home}/lib"/> + <property name="axsl.build" location="${lib.dir}"/> + + <path id="libs-build-classpath"> + <fileset dir="${axsl.build}"> + <include name="**/axsl*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="xml-apis.jar"/> + <include name="batik.jar"/> + <include name="axsl*.jar"/> + <include name="commons-logging.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-common/build/ant"> + <include name="*.jar"/> + </fileset> + </path> + </target> + + <!-- =================================================================== --> + <!-- Initialization target --> + <!-- =================================================================== --> + <target name="init" depends="env"> + <tstamp/> + <property name="name" value="foray"/> + <property name="contact.info" + value="The FOray project http://www.foray.org"/> + <property name="module" value="areatree"/> + <property name="module.dir" value="${foray.home}/foray-${module}"/> + <property name="version" value="0.1"/> + <property name="src.dir" value="${module.dir}/src"/> + <property name="build.dir" value="${module.dir}/build/ant"/> + <property name="classes.dir" value="${build.dir}/classes"/> + <property name="debug" value="on"/> + <property name="optimize" value="off"/> + <property name="deprecation" value="off"/> + <property name="source" value="1.4"/> + </target> + + <!-- =================================================================== --> + <!-- Prepares the build directory --> + <!-- =================================================================== --> + <target name="prepare" depends="init"> + <!-- create directories --> + <echo message="Preparing the build directories"/> + <mkdir dir="${build.dir}"/> + <mkdir dir="${classes.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the source directory --> + <!-- =================================================================== --> + <target name="compile" depends="prepare"> + <echo message="Compiling the sources "/> + <!-- create directories --> + <mkdir dir="${build.dir}"/> + <javac srcdir="${src.dir}" + destdir="${classes.dir}" + debug="${debug}" + deprecation="${deprecation}" + optimize="${optimize}" + source="${source}" + > + <classpath refid="libs-build-classpath"/> + </javac> + </target> + + <!-- =================================================================== --> + <!-- Creates the class package --> + <!-- =================================================================== --> + <target name="package" depends="compile, style" + description="Generates the jar files (default target)"> + <echo message="Creating the jar file ${build.dir}/${name}.jar"/> + + <tstamp> + <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> + </tstamp> + <jar jarfile="${build.dir}/${name}-${module}.jar" + basedir="${classes.dir}" + > + <manifest> + <attribute name="Implementation-Title" value="${name}-${module}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" + value="${contact.info}"/> + </manifest> + </jar> + + </target> + + <target name="javadoc-api" depends="init" description="Creates API + documentation"> + <echo message="Producing the javadoc files "/> + <mkdir dir="${build.dir}/javadoc-api"/> + <javadoc + packagenames="org.foray.area" + sourcepath="${src.dir}/java" + destdir="${build.dir}/javadoc-api" + classpathref="libs-build-classpath" + author="true" + version="true" + windowtitle="FOray AreaTree API" + doctitle="FOray AreaTree API" + bottom="Copyright © 2004 The FOray Project. All Rights Reserved." + overview="${src.dir}/java/org/foray/area/overview.html" + use="true" + access="public" + failonerror="true"> + <classpath refid="libs-build-classpath"/> + <classpath> + <fileset dir="${lib.dir}"> + <include name="ant*.jar"/> + </fileset> + </classpath> + </javadoc> + </target> + + <!-- =================================================================== --> + <!-- Clean targets --> + <!-- =================================================================== --> + <target name="clean" depends="init" description="Cleans the build directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + +</project> + +<!-- Last Line of $RCSfile$ --> Property changes on: trunk/foray/foray-layout/scripts/build.xml ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-layout/src/java/org/foray/layout/package.html =================================================================== --- trunk/foray/foray-layout/src/java/org/foray/layout/package.html (rev 0) +++ trunk/foray/foray-layout/src/java/org/foray/layout/package.html 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.layout</title> +<body> +<p>Generic classes used by actual layout strategies.</p> +</body> +</html> Property changes on: trunk/foray/foray-layout/src/java/org/foray/layout/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-25 15:11:01
|
Revision: 7251 Author: victormote Date: 2006-05-25 08:10:46 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7251&view=rev Log Message: ----------- Add package for creating FOray-specific objects. Added Paths: ----------- trunk/foray/foray-specific/ trunk/foray/foray-specific/.checkstyle trunk/foray/foray-specific/.classpath trunk/foray/foray-specific/.project trunk/foray/foray-specific/scripts/ trunk/foray/foray-specific/scripts/build.bat trunk/foray/foray-specific/scripts/build.sh trunk/foray/foray-specific/scripts/build.xml trunk/foray/foray-specific/src/ trunk/foray/foray-specific/src/java/ trunk/foray/foray-specific/src/java/org/ trunk/foray/foray-specific/src/java/org/foray/ trunk/foray/foray-specific/src/java/org/foray/specific/ trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java Property changes on: trunk/foray/foray-specific ___________________________________________________________________ Name: svn:ignore + build zzlocal Added: trunk/foray/foray-specific/.checkstyle =================================================================== --- trunk/foray/foray-specific/.checkstyle (rev 0) +++ trunk/foray/foray-specific/.checkstyle 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-specific/.classpath =================================================================== --- trunk/foray/foray-specific/.classpath (rev 0) +++ trunk/foray/foray-specific/.classpath 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding=".#*" kind="src" path="src/java"/> + <classpathentry kind="src" path="scripts"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/servlet-2.2.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/xalan-2.4.1.jar"/> + <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/resolver.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/xml-apis-1.3.02.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> + <classpathentry kind="var" path="ANT_HOME/lib/ant-launcher.jar"/> + <classpathentry kind="var" path="ANT_HOME/lib/ant-trax.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayApp"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayFont"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslText"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayText"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslGraphic-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayGraphic"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslFO-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslLayout"/> + <classpathentry kind="output" path="build/eclipse"/> +</classpath> Added: trunk/foray/foray-specific/.project =================================================================== --- trunk/foray/foray-specific/.project (rev 0) +++ trunk/foray/foray-specific/.project 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>FOrayApp</name> + <comment></comment> + <projects> + <project>FOrayCommon</project> + <project>FOrayFont</project> + <project>FOrayFOTree</project> + <project>FOrayGraphic</project> + <project>FOrayPDF</project> + <project>FOrayPS</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + </natures> +</projectDescription> Added: trunk/foray/foray-specific/scripts/build.bat =================================================================== --- trunk/foray/foray-specific/scripts/build.bat (rev 0) +++ trunk/foray/foray-specific/scripts/build.bat 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,27 @@ +@echo off + +echo "FOray Build System" +echo "------------------" + +IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR +IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR + +call %ANT_HOME%\bin\ant.bat %* + +GOTO END + +:JAVA_HOME_ERR + echo ERROR: JAVA_HOME not found in your environment. + echo + echo Please set the JAVA_HOME variable in your environment to match the + echo location of the Java Virtual Machine you want to use. +GOTO END + +:ANT_HOME_ERR + echo ERROR: ANT_HOME not found in your environment. + echo + echo Please set the ANT_HOME variable in your environment to match the + echo location of the root of your ANT installation. +GOTO END + +:END Added: trunk/foray/foray-specific/scripts/build.sh =================================================================== --- trunk/foray/foray-specific/scripts/build.sh (rev 0) +++ trunk/foray/foray-specific/scripts/build.sh 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,29 @@ +#!/bin/sh + +# This file must be executable. + +echo +echo "FOray Build System" +echo "------------------" + +if [ "$JAVA_HOME" = "" ] +then + echo "ERROR: JAVA_HOME not found in your environment." + echo + echo "Please set the JAVA_HOME variable in your environment to match the" + echo "location of the Java Virtual Machine you want to use." + exit 1 +fi + +if [ "$ANT_HOME" = "" ] +then + echo "ERROR: ANT_HOME not found in your environment." + echo + echo "Please set the ANT_HOME variable in your environment to match the" + echo "location of the root of your ANT installation." + exit 1 +fi + +"$ANT_HOME"/bin/ant "$@" + +##### Last Line of $RCSfile$ ##### Property changes on: trunk/foray/foray-specific/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-specific/scripts/build.xml =================================================================== --- trunk/foray/foray-specific/scripts/build.xml (rev 0) +++ trunk/foray/foray-specific/scripts/build.xml 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,199 @@ +<?xml version="1.0"?> +<!-- $Id$ --> + +<project default="package" basedir="."> + + <!-- Set up a prefix to designate environment variables. --> + <property environment="env"/> + + <target name="env"> + <!-- If the environment variable FORAY_CONFIG is set, use it. --> + <condition property="foray.config" value="${env.FORAY_CONFIG}"> + <and> + <isset property="env.FORAY_CONFIG"/> + <available file="${env.FORAY_CONFIG}"/> + </and> + </condition> + <!-- Otherwise, set it to the FOray scripts directory. --> + <property name="foray.config" location="../../scripts"/> + <echo>foray.config: ${foray.config}</echo> + + <!-- Retrieve externally-configured properties. --> + <property file="${foray.config}/foray-build.properties"/> + + <!-- Get a default for {foray.home}. --> + <property name="foray.home" location="../.."/> + <echo>foray.home: ${foray.home}</echo> + + <!-- Set up dependent properties. --> + <property name="lib.dir" location="${foray.home}/lib"/> + <property name="axsl.build" location="${lib.dir}"/> + + <path id="libs-build-classpath"> + <fileset dir="${axsl.build}"> + <include name="**/axsl*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="xml-apis*.jar"/> + <include name="servlet*.jar"/> + <include name="axsl*.jar"/> + <include name="xercesImpl*.jar"/> + <include name="commons-logging.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-common/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-font/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-graphic/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-pdf/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-text/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-fotree/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-areatree/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-layout/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-pioneer/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-output/build/ant"> + <include name="*.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-render/build/ant"> + <include name="*.jar"/> + </fileset> + </path> + </target> + + <!-- =================================================================== --> + <!-- Initialization target --> + <!-- =================================================================== --> + <target name="init" depends="env"> + <tstamp/> + <property name="name" value="foray"/> + <property name="contact.info" + value="The FOray project http://www.foray.org"/> + <property name="module" value="app"/> + <property name="module.dir" value="${foray.home}/foray-${module}"/> + <property name="version" value="0.1"/> + <property name="src.dir" value="${module.dir}/src"/> + <property name="build.dir" value="${module.dir}/build/ant"/> + <property name="classes.dir" value="${build.dir}/classes"/> + <property name="debug" value="on"/> + <property name="optimize" value="off"/> + <property name="deprecation" value="off"/> + <property name="source" value="1.4"/> + </target> + + <!-- =================================================================== --> + <!-- Prepares the build directory --> + <!-- =================================================================== --> + <target name="prepare" depends="init"> + <!-- create directories --> + <echo message="Preparing the build directories"/> + <mkdir dir="${build.dir}"/> + <mkdir dir="${classes.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the source directory --> + <!-- =================================================================== --> + <target name="compile" depends="prepare"> + <echo message="Compiling the sources "/> + <!-- create directories --> + <mkdir dir="${build.dir}"/> + <javac srcdir="${src.dir}" + destdir="${classes.dir}" + debug="${debug}" + deprecation="${deprecation}" + optimize="${optimize}" + source="${source}" + > + <classpath refid="libs-build-classpath"/> + </javac> + </target> + + <!-- =================================================================== --> + <!-- Creates the class package --> + <!-- =================================================================== --> + <target name="package" depends="compile, style" + description="Generates the jar files (default target)"> + <echo message="Creating the jar file ${build.dir}/${name}.jar"/> + + <tstamp> + <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> + </tstamp> + <jar jarfile="${build.dir}/${name}-${module}.jar" + basedir="${classes.dir}" + > + <manifest> + <attribute name="Implementation-Title" value="${name}-${module}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" + value="${contact.info}"/> + </manifest> + </jar> + + </target> + + <target name="javadoc-api" depends="init" description="Creates API + documentation"> + <echo message="Producing the javadoc files "/> + <mkdir dir="${build.dir}/javadoc-api"/> + <javadoc + packagenames="org.foray.app" + sourcepath="${src.dir}/java" + destdir="${build.dir}/javadoc-api" + classpathref="libs-build-classpath" + author="true" + version="true" + windowtitle="FOray Application API" + doctitle="FOray Application API" + bottom="Copyright © 2004 The FOray Project. All Rights Reserved." + overview="${src.dir}/java/org/foray/app/overview.html" + use="true" + access="public" + failonerror="true"> + <classpath refid="libs-build-classpath"/> + </javadoc> + </target> + + <!-- =================================================================== --> + <!-- Clean targets --> + <!-- =================================================================== --> + <target name="clean" depends="init" description="Cleans the build directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + +</project> + +<!-- Last Line of $RCSfile$ --> Property changes on: trunk/foray/foray-specific/scripts/build.xml ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java =================================================================== --- trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java (rev 0) +++ trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java 2006-05-25 15:10:46 UTC (rev 7251) @@ -0,0 +1,107 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.specific; + +import org.foray.app.FOrayException; +import org.foray.app.SessionConfig; +import org.foray.common.XMLParser; +import org.foray.font.FOrayFontServer; +import org.foray.graphic.FOrayGraphicServer; + +import org.axsl.areaW.AreaTreeFactory; +import org.axsl.foR.FOTreeFactory; +import org.axsl.fontR.FontException; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; +import org.axsl.layout.LayoutFactory; +import org.axsl.text.TextServer; + +import org.apache.commons.logging.Log; + +import org.xml.sax.EntityResolver; + +import java.net.URL; + +public class FOraySpecific { + + private Log logger; + + public FOraySpecific(Log logger) throws FOrayException { + this.logger = logger; + } + + public Log getLogger() { + return this.logger; + } + + public FontServer makeFontServer(SessionConfig configuration, + EntityResolver entityResolver) throws FOrayException { + FOrayFontServer forayFontServer = new FOrayFontServer(getLogger()); + forayFontServer.setBaseFontURL( + configuration.optionFontBaseDirectory()); + forayFontServer.setBaseURL(configuration.optionBaseDirectory()); + forayFontServer.setEntityResolver(entityResolver); + try { + forayFontServer.setup(configuration.optionFontConfiguration(), + null); + } catch (FontException e) { + throw new FOrayException(e); + } + return forayFontServer; + } + + public TextServer makeTextServer(SessionConfig configuration) + throws FOrayException { + URL hyphenationDir = configuration.optionHyphenationBaseDirectory(); + return new org.foray.text.TextServer(getLogger(), + hyphenationDir); + + } + + public GraphicServer makeGraphicServer() throws FOrayException { + return new FOrayGraphicServer(getLogger(), + XMLParser.getParserClassName()); + } + + public FOTreeFactory makeFOTreeFactory(GraphicServer graphicServer, + TextServer textServer, URL[] graphicSearchPath) + throws FOrayException { + return null; +// return new FOrayFOTreeServer(this.getLogger(), +// graphicServer, textServer, graphicSearchPath,Wi +// getConfiguration().optionCacheGraphics()); +// + } + + public AreaTreeFactory makeAreaTreeFactory() + throws FOrayException { + return null; + } + + public LayoutFactory makeLayoutFactory() throws FOrayException { + return null; + } + +} Property changes on: trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-26 17:23:19
|
Revision: 7266 Author: victormote Date: 2006-05-26 10:23:07 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7266&view=rev Log Message: ----------- Move the FOraySpecific class to the app package and delete the specific package. Added Paths: ----------- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java Removed Paths: ------------- trunk/foray/foray-specific/ Copied: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java (from rev 7265, trunk/foray/foray-specific/src/java/org/foray/specific/FOraySpecific.java) =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java (rev 0) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-05-26 17:23:07 UTC (rev 7266) @@ -0,0 +1,117 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.app; + +import org.foray.common.Logging; +import org.foray.common.XMLParser; +import org.foray.font.FOrayFontServer; +import org.foray.graphic.FOrayGraphicServer; + +import org.axsl.areaW.AreaTreeFactory; +import org.axsl.foR.FOTreeFactory; +import org.axsl.fontR.FontException; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; +import org.axsl.layout.LayoutFactory; +import org.axsl.text.TextServer; + +import org.apache.commons.logging.Log; + +import org.xml.sax.EntityResolver; + +import java.net.URL; + +/** + * Utility class that creates FOray-specific implementations of the high-level + * objects for each module. + * The purpose of the methods in this class is to simplify the task of getting + * FOray started up in a standard manner without diminishing the flexibility + * of its pluggable nature. + */ +public class FOraySpecific { + + /** + * Private constructor, as this class should never be instantiated. + */ + private FOraySpecific() { + } + + public static Log makeLogger(SessionConfig configuration) { + if (configuration.optionVerbosity().equals("debug")) { + return Logging.makeDebugLogger(); + } else { + return Logging.makeDefaultLogger(); + } + } + + public static FontServer makeFontServer(Log logger, + SessionConfig configuration, EntityResolver entityResolver) + throws FOrayException { + FOrayFontServer forayFontServer = new FOrayFontServer(logger); + forayFontServer.setBaseFontURL( + configuration.optionFontBaseDirectory()); + forayFontServer.setBaseURL(configuration.optionBaseDirectory()); + forayFontServer.setEntityResolver(entityResolver); + try { + forayFontServer.setup(configuration.optionFontConfiguration(), + null); + } catch (FontException e) { + throw new FOrayException(e); + } + return forayFontServer; + } + + public static TextServer makeTextServer(Log logger, + SessionConfig configuration) throws FOrayException { + URL hyphenationDir = configuration.optionHyphenationBaseDirectory(); + return new org.foray.text.TextServer(logger, hyphenationDir); + + } + + public static GraphicServer makeGraphicServer(Log logger) + throws FOrayException { + return new FOrayGraphicServer(logger, XMLParser.getParserClassName()); + } + + public FOTreeFactory makeFOTreeFactory(GraphicServer graphicServer, + TextServer textServer, URL[] graphicSearchPath) + throws FOrayException { + return null; +// return new FOrayFOTreeServer(this.getLogger(), +// graphicServer, textServer, graphicSearchPath,Wi +// getConfiguration().optionCacheGraphics()); +// + } + + public AreaTreeFactory makeAreaTreeFactory() + throws FOrayException { + return null; + } + + public LayoutFactory makeLayoutFactory() throws FOrayException { + return null; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-26 17:49:17
|
Revision: 7267 Author: victormote Date: 2006-05-26 10:48:40 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7267&view=rev Log Message: ----------- Move FOrayException class to new core package. Modified Paths: -------------- trunk/foray/foray-app/.classpath trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/FOray.java trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/Options.java trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java trunk/foray/foray-app/src/java/org/foray/app/Starter.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java Added Paths: ----------- trunk/foray/foray-core/ trunk/foray/foray-core/src/ trunk/foray/foray-core/src/java/ trunk/foray/foray-core/src/java/org/ trunk/foray/foray-core/src/java/org/foray/ trunk/foray/foray-core/src/java/org/foray/core/ trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java Removed Paths: ------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java Modified: trunk/foray/foray-app/.classpath =================================================================== --- trunk/foray/foray-app/.classpath 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/.classpath 2006-05-26 17:48:40 UTC (rev 7267) @@ -32,5 +32,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> <classpathentry combineaccessrules="false" kind="src" path="/FOrayLayout"/> <classpathentry combineaccessrules="false" kind="src" path="/axslLayout"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayCore"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -31,6 +31,7 @@ * Modified to use streaming API by Mark Lillywhite, mar...@in... */ +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.foray.render.awt.AWTRenderer; import org.foray.render.awt.viewer.PreviewDialog; Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,7 @@ package org.foray.app; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,6 +24,7 @@ package org.foray.app; +import org.foray.core.FOrayException; import org.foray.layout.LayoutStrategy; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,6 +24,7 @@ package org.foray.app; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,8 @@ package org.foray.app; +import org.foray.core.FOrayException; + import org.apache.commons.logging.Log; import org.xml.sax.InputSource; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOray.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,7 @@ package org.foray.app; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,7 @@ package org.foray.app; import org.foray.common.XMLParser; +import org.foray.core.FOrayException; import org.foray.output.MIFConverter; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Deleted: trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -1,166 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.app; - -import org.xml.sax.SAXException; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.lang.reflect.InvocationTargetException; - -/** - * Exception thrown when FOray has a problem. - */ -public class FOrayException extends Exception { - static final long serialVersionUID = 298590433713255908L; - - private static final String EXCEPTION_SEPARATOR = "\n---------\n"; - - private Throwable _exception; - private String contextMessage; - - /** - * Create a new FOray Exception - * - * @param message descriptive message - */ - public FOrayException(String message) { - super(message); - this.contextMessage = null; - } - - public FOrayException(String message, String contextMessage) { - super(message); - this.contextMessage = contextMessage; - } - - public FOrayException(Throwable e) { - super(e.getMessage()); - setException(e); - this.contextMessage = null; - } - - public FOrayException(Throwable e, String contextMessage) { - super(e.getMessage()); - setException(e); - this.contextMessage = contextMessage; - } - - public FOrayException(String message, Throwable e) { - super(message); - setException(e); - this.contextMessage = null; - } - - public FOrayException(String message, Throwable e, String contextMessage) { - super(message); - setException(e); - this.contextMessage = contextMessage; - } - - protected void setException(Throwable t) { - _exception = t; - } - - public Throwable getException() { - return _exception; - } - - public void setContextMessage(String contextMessage) { - this.contextMessage = contextMessage; - } - - public boolean isContextSet() { - return this.contextMessage != null; - } - - protected Throwable getRootException() { - Throwable result = _exception; - - if (result instanceof SAXException) { - result = ((SAXException)result).getException(); - } - if (result instanceof InvocationTargetException) { - result = - ((InvocationTargetException)result) - .getTargetException(); - } - if (result != _exception) { - return result; - } - return null; - } - - public String getMessage() { - if (this.contextMessage != null) { - return super.getMessage() + "\n" - + this.contextMessage; - } - return super.getMessage(); - } - - public void printStackTrace() { - synchronized (System.err) { - super.printStackTrace(); - if (_exception != null) { - System.err.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(); - } - if (getRootException() != null) { - System.err.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(); - } - } - } - - public void printStackTrace(PrintStream stream) { - synchronized (stream) { - super.printStackTrace(stream); - if (_exception != null) { - stream.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(stream); - } - if (getRootException() != null) { - stream.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(stream); - } - } - } - - public void printStackTrace(PrintWriter writer) { - synchronized (writer) { - super.printStackTrace(writer); - if (_exception != null) { - writer.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(writer); - } - if (getRootException() != null) { - writer.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(writer); - } - } - } - -} Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -27,6 +27,7 @@ import org.foray.area.FOrayAreaTreeFactory; import org.foray.common.Logging; import org.foray.common.XMLParser; +import org.foray.core.FOrayException; import org.foray.font.FOrayFontServer; import org.foray.fotree.FOrayFOTreeServer; import org.foray.graphic.FOrayGraphicServer; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -26,6 +26,7 @@ import org.foray.common.Logging; import org.foray.common.XMLParser; +import org.foray.core.FOrayException; import org.foray.font.FOrayFontServer; import org.foray.graphic.FOrayGraphicServer; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,6 +24,7 @@ package org.foray.app; +import org.foray.core.FOrayException; import org.foray.output.OutputTarget; import org.foray.render.Renderer; Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,8 @@ package org.foray.app; +import org.foray.core.FOrayException; + import org.apache.commons.logging.Log; import org.xml.sax.InputSource; Modified: trunk/foray/foray-app/src/java/org/foray/app/Options.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,6 +24,7 @@ package org.foray.app; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,6 +25,7 @@ package org.foray.app; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,6 +24,7 @@ package org.foray.app; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -26,6 +26,8 @@ +import org.foray.core.FOrayException; + import org.apache.commons.logging.Log; import org.xml.sax.InputSource; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -24,10 +24,10 @@ package org.foray.app.ant; -import org.foray.app.FOrayException; import org.foray.app.FOrayTarget; import org.foray.app.Starter; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.apache.commons.logging.Log; import org.apache.tools.ant.BuildException; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -26,13 +26,13 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; -import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.Options; import org.foray.app.SessionConfig; import org.foray.app.Starter; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -26,13 +26,13 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; -import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.SessionConfig; import org.foray.app.TraxInputHandler; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -35,13 +35,13 @@ import javax.xml.transform.TransformerException; import org.foray.app.Application; -import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; +import org.foray.core.FOrayException; import org.foray.render.awt.AWTRenderer; import org.foray.render.awt.viewer.PreviewDialog; import org.foray.render.awt.viewer.SecureResourceBundle; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -30,13 +30,13 @@ import java.io.OutputStream; import org.foray.app.Application; -import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; +import org.foray.core.FOrayException; import org.foray.output.OutputTarget; /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -36,13 +36,13 @@ import javax.xml.transform.stream.StreamSource; import org.foray.app.Application; -import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.output.OutputTarget; +import org.foray.core.FOrayException; import org.foray.demo.embed.model.ProjectTeam; /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -36,11 +36,11 @@ import javax.xml.transform.stream.StreamSource; import org.foray.app.Application; -import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; +import org.foray.core.FOrayException; import org.foray.output.OutputTarget; /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -26,12 +26,12 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; -import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.SessionConfig; import org.foray.common.Logging; +import org.foray.core.FOrayException; import org.foray.output.OutputTarget; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,10 +25,10 @@ package org.foray.demo.servlet; import org.foray.app.FOrayDocument; -import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; +import org.foray.core.FOrayException; import org.foray.render.awt.AWTPrintRenderer; import java.awt.print.PrinterJob ; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-05-26 17:23:07 UTC (rev 7266) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -25,10 +25,10 @@ package org.foray.demo.servlet; import org.foray.app.FOrayDocument; -import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; +import org.foray.core.FOrayException; import org.foray.output.OutputTarget; import java.io.ByteArrayOutputStream; Copied: trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java (from rev 7265, trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java) =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java (rev 0) +++ trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java 2006-05-26 17:48:40 UTC (rev 7267) @@ -0,0 +1,166 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.core; + +import org.xml.sax.SAXException; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.lang.reflect.InvocationTargetException; + +/** + * Exception thrown when FOray has a problem. + */ +public class FOrayException extends Exception { + static final long serialVersionUID = 298590433713255908L; + + private static final String EXCEPTION_SEPARATOR = "\n---------\n"; + + private Throwable _exception; + private String contextMessage; + + /** + * Create a new FOray Exception + * + * @param message descriptive message + */ + public FOrayException(String message) { + super(message); + this.contextMessage = null; + } + + public FOrayException(String message, String contextMessage) { + super(message); + this.contextMessage = contextMessage; + } + + public FOrayException(Throwable e) { + super(e.getMessage()); + setException(e); + this.contextMessage = null; + } + + public FOrayException(Throwable e, String contextMessage) { + super(e.getMessage()); + setException(e); + this.contextMessage = contextMessage; + } + + public FOrayException(String message, Throwable e) { + super(message); + setException(e); + this.contextMessage = null; + } + + public FOrayException(String message, Throwable e, String contextMessage) { + super(message); + setException(e); + this.contextMessage = contextMessage; + } + + protected void setException(Throwable t) { + _exception = t; + } + + public Throwable getException() { + return _exception; + } + + public void setContextMessage(String contextMessage) { + this.contextMessage = contextMessage; + } + + public boolean isContextSet() { + return this.contextMessage != null; + } + + protected Throwable getRootException() { + Throwable result = _exception; + + if (result instanceof SAXException) { + result = ((SAXException)result).getException(); + } + if (result instanceof InvocationTargetException) { + result = + ((InvocationTargetException)result) + .getTargetException(); + } + if (result != _exception) { + return result; + } + return null; + } + + public String getMessage() { + if (this.contextMessage != null) { + return super.getMessage() + "\n" + + this.contextMessage; + } + return super.getMessage(); + } + + public void printStackTrace() { + synchronized (System.err) { + super.printStackTrace(); + if (_exception != null) { + System.err.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(); + } + if (getRootException() != null) { + System.err.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(); + } + } + } + + public void printStackTrace(PrintStream stream) { + synchronized (stream) { + super.printStackTrace(stream); + if (_exception != null) { + stream.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(stream); + } + if (getRootException() != null) { + stream.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(stream); + } + } + } + + public void printStackTrace(PrintWriter writer) { + synchronized (writer) { + super.printStackTrace(writer); + if (_exception != null) { + writer.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(writer); + } + if (getRootException() != null) { + writer.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(writer); + } + } + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-08 17:21:23
|
Revision: 7445 Author: victormote Date: 2006-06-08 10:21:04 -0700 (Thu, 08 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7445&view=rev Log Message: ----------- Initial creation of separate hyphenation package. Added Paths: ----------- trunk/foray/foray-hyphen-r/ trunk/foray/foray-hyphen-r/.checkstyle trunk/foray/foray-hyphen-r/.classpath trunk/foray/foray-hyphen-r/.project trunk/foray/foray-hyphen-r/scripts/ trunk/foray/foray-hyphen-r/scripts/build.bat trunk/foray/foray-hyphen-r/scripts/build.sh trunk/foray/foray-hyphen-r/scripts/build.xml trunk/foray/foray-hyphen-r/src/ trunk/foray/foray-hyphen-r/src/java/ trunk/foray/foray-hyphen-r/src/java/org/ trunk/foray/foray-hyphen-r/src/java/org/foray/ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/ Property changes on: trunk/foray/foray-hyphen-r ___________________________________________________________________ Name: svn:ignore + build zzlocal Added: trunk/foray/foray-hyphen-r/.checkstyle =================================================================== --- trunk/foray/foray-hyphen-r/.checkstyle (rev 0) +++ trunk/foray/foray-hyphen-r/.checkstyle 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-hyphen-r/.classpath =================================================================== --- trunk/foray/foray-hyphen-r/.classpath (rev 0) +++ trunk/foray/foray-hyphen-r/.classpath 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding=".#*" kind="src" path="src/java"/> + <classpathentry kind="src" path="scripts"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build/eclipse"/> +</classpath> Added: trunk/foray/foray-hyphen-r/.project =================================================================== --- trunk/foray/foray-hyphen-r/.project (rev 0) +++ trunk/foray/foray-hyphen-r/.project 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>FOrayHyphenR</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + </natures> +</projectDescription> Added: trunk/foray/foray-hyphen-r/scripts/build.bat =================================================================== --- trunk/foray/foray-hyphen-r/scripts/build.bat (rev 0) +++ trunk/foray/foray-hyphen-r/scripts/build.bat 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,27 @@ +@echo off + +echo "FOray Build System" +echo "------------------" + +IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR +IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR + +call %ANT_HOME%\bin\ant.bat %* + +GOTO END + +:JAVA_HOME_ERR + echo ERROR: JAVA_HOME not found in your environment. + echo + echo Please set the JAVA_HOME variable in your environment to match the + echo location of the Java Virtual Machine you want to use. +GOTO END + +:ANT_HOME_ERR + echo ERROR: ANT_HOME not found in your environment. + echo + echo Please set the ANT_HOME variable in your environment to match the + echo location of the root of your ANT installation. +GOTO END + +:END Added: trunk/foray/foray-hyphen-r/scripts/build.sh =================================================================== --- trunk/foray/foray-hyphen-r/scripts/build.sh (rev 0) +++ trunk/foray/foray-hyphen-r/scripts/build.sh 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,29 @@ +#!/bin/sh + +# This file must be executable. + +echo +echo "FOray Build System" +echo "------------------" + +if [ "$JAVA_HOME" = "" ] +then + echo "ERROR: JAVA_HOME not found in your environment." + echo + echo "Please set the JAVA_HOME variable in your environment to match the" + echo "location of the Java Virtual Machine you want to use." + exit 1 +fi + +if [ "$ANT_HOME" = "" ] +then + echo "ERROR: ANT_HOME not found in your environment." + echo + echo "Please set the ANT_HOME variable in your environment to match the" + echo "location of the root of your ANT installation." + exit 1 +fi + +"$ANT_HOME"/bin/ant "$@" + +##### Last Line of $RCSfile$ ##### Property changes on: trunk/foray/foray-hyphen-r/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-hyphen-r/scripts/build.xml =================================================================== --- trunk/foray/foray-hyphen-r/scripts/build.xml (rev 0) +++ trunk/foray/foray-hyphen-r/scripts/build.xml 2006-06-08 17:21:04 UTC (rev 7445) @@ -0,0 +1,204 @@ +<?xml version="1.0"?> +<!-- $Id$ --> + +<project default="package" basedir="."> + + <!-- Set up a prefix to designate environment variables. --> + <property environment="env"/> + + <target name="env"> + <!-- If the environment variable FORAY_CONFIG is set, use it. --> + <condition property="foray.config" value="${env.FORAY_CONFIG}"> + <and> + <isset property="env.FORAY_CONFIG"/> + <available file="${env.FORAY_CONFIG}"/> + </and> + </condition> + <!-- Otherwise, set it to the FOray scripts directory. --> + <property name="foray.config" location="../../scripts"/> + <echo>foray.config: ${foray.config}</echo> + + <!-- Retrieve externally-configured properties. --> + <property file="${foray.config}/foray-build.properties"/> + + <!-- Get a default for {foray.home}. --> + <property name="foray.home" location="../.."/> + <echo>foray.home: ${foray.home}</echo> + + <!-- Set up dependent properties. --> + <property name="lib.dir" location="${foray.home}/lib"/> + <property name="axsl.build" location="${lib.dir}"/> + + <path id="libs-build-classpath"> + <fileset dir="${axsl.build}"> + <include name="**/axsl*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="avalon-framework*.jar"/> + <include name="xml-apis*.jar"/> + <include name="xerces*.jar"/> + <include name="axsl*.jar"/> + <include name="commons-logging.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-common/build/ant"> + <include name="*.jar"/> + </fileset> + </path> + </target> + + <!-- =================================================================== --> + <!-- Initialization target --> + <!-- =================================================================== --> + <target name="init" depends="env"> + <tstamp/> + <property name="name" value="foray"/> + <property name="contact.info" + value="The FOray project http://www.foray.org"/> + <property name="module" value="hyphen-r"/> + <property name="module.dir" value="${foray.home}/foray-${module}"/> + <property name="version" value="0.1"/> + <property name="src.dir" value="${module.dir}/src"/> + <property name="build.dir" value="${module.dir}/build/ant"/> + <property name="classes.dir" value="${build.dir}/classes"/> + <property name="resource.dir" value="${module.dir}/resource"/> + <property name="debug" value="on"/> + <property name="optimize" value="off"/> + <property name="deprecation" value="off"/> + <property name="source" value="1.4"/> + <property name="hyph.source" value="${resource.dir}/hyph-patterns"/> + <property name="hyph.build" value="${build.dir}/hyph"/> + </target> + + <!-- =================================================================== --> + <!-- Prepares the build directory --> + <!-- =================================================================== --> + <target name="prepare" depends="init"> + <!-- create directories --> + <echo message="Preparing the build directories"/> + <mkdir dir="${build.dir}"/> + <mkdir dir="${classes.dir}"/> + <mkdir dir="${hyph.build}"/> + </target> + + + <!-- =================================================================== --> + <!-- compiles hyphenation patterns --> + <!-- =================================================================== --> + <target name="hyphenation" depends="compile" > + <path id="hyph-classpath"> + <path refid="libs-build-classpath"/> + <pathelement location="${classes.dir}"/> + </path> + <taskdef name="serHyph" + classname="org.foray.hyphenR.SerializeHyphPattern" + classpathref="hyph-classpath"/> + <serHyph includes="*.xml" + sourceDir="${hyph.source}" + targetDir="${hyph.build}" /> + </target> + + + <!-- =================================================================== --> + <!-- Compiles the source directory --> + <!-- =================================================================== --> + <target name="compile" depends="prepare"> + <echo message="Compiling the sources "/> + <!-- create directories --> + <mkdir dir="${build.dir}"/> + <javac srcdir="${src.dir}" + destdir="${classes.dir}" + debug="${debug}" + deprecation="${deprecation}" + optimize="${optimize}" + source="${source}" + > + <classpath refid="libs-build-classpath"/> + </javac> + </target> + + <!-- =================================================================== --> + <!-- Creates the class package --> + <!-- =================================================================== --> + <target name="package" depends="compile, style, hyphenation" + description="Generates the jar files (default target)"> + <echo message="Creating the jar file ${build.dir}/${name}.jar"/> + + <tstamp> + <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> + </tstamp> + <fileset id="foray-hyphen-classes" + dir="${foray.home}/foray-hyphen-r/build/ant/classes"> + <include name="**"/> + </fileset> + <fileset id="foray-hyphen-resources" + dir="${foray.home}/foray-hyphen-r/build/ant"> + <include name="hyph/**"/> + </fileset> + <jar jarfile="${build.dir}/${name}-${module}.jar"> + <fileset refid="foray-hyphen-classes"/> + <fileset refid="foray-hyphen-resources"/> + <manifest> + <attribute name="Implementation-Title" value="${name}-${module}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" + value="${contact.info}"/> + </manifest> + </jar> + + </target> + + <target name="javadoc-api" depends="init" description="Creates API + documentation"> + <echo message="Producing the javadoc files "/> + <mkdir dir="${build.dir}/javadoc-api"/> + <javadoc + packagenames="org.foray.hyphenR" + sourcepath="${src.dir}/java" + destdir="${build.dir}/javadoc-api" + classpathref="libs-build-classpath" + author="true" + version="true" + windowtitle="FOray Hyphenation API" + doctitle="FOray Hyphenation API" + bottom="Copyright © 2004 The FOray Project. All Rights Reserved." + overview="${src.dir}/java/org/foray/hyphenR/overview.html" + use="true" + access="public" + failonerror="true"> + <classpath refid="libs-build-classpath"/> + <classpath> + <fileset dir="${lib.dir}"> + <include name="ant*.jar"/> + </fileset> + </classpath> + </javadoc> + </target> + + <!-- =================================================================== --> + <!-- Clean targets --> + <!-- =================================================================== --> + <target name="clean" depends="init" description="Cleans the build directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + +</project> + +<!-- Last Line of $RCSfile$ --> Property changes on: trunk/foray/foray-hyphen-r/scripts/build.xml ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-09-01 01:27:20
|
Revision: 7846
http://svn.sourceforge.net/foray/?rev=7846&view=rev
Author: victormote
Date: 2006-08-31 18:26:03 -0700 (Thu, 31 Aug 2006)
Log Message:
-----------
Add javadoc.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java
trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java
trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTCTableHeader.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java
trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutputFactory.java
trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDFFactory.java
trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPSFactory.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/AlignmentBaseline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundColor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.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/Boolean.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.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/ColumnNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.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/ExternalDestination.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.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/InternalDestination.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.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/Name.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SwitchTo.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.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/TextDepth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Function.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFImageElementBridge.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -36,6 +36,9 @@
import org.axsl.foR.fo.TableFooter;
import org.axsl.foR.fo.TableHeader;
+/**
+ * Area containing part or all of a {@link Table}.
+ */
public class TableRA extends AbstractNormalBlockArea implements TableArea,
org.axsl.areaW.TableArea {
Modified: trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -27,6 +27,9 @@
import java.awt.Color;
import java.awt.color.ColorSpace;
+/**
+ * A {@link ColorSpace} implementation for CMYK.
+ */
public class ColorSpaceCMYK extends ColorSpace {
static final long serialVersionUID = 34959014422981446L;
Modified: trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -31,6 +31,9 @@
import java.awt.geom.AffineTransform;
import java.awt.geom.Dimension2D;
+/**
+ * A User Agent for Batik.
+ */
public class SVGUserAgent extends UserAgentAdapter {
AffineTransform currentTransform = null;
Modified: trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -32,6 +32,9 @@
import java.io.IOException;
import java.io.InputStream;
+/**
+ * High-level representation of a TrueType font.
+ */
public class FSTrueTypeFont extends FreeStandingFont {
protected TTFFont ttf;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTCTableHeader.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTCTableHeader.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTCTableHeader.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -26,6 +26,9 @@
import java.io.IOException;
+/**
+ * A TTC (TrueType Collection) header.
+ */
public class TTCTableHeader {
/** The parent TTCFile. */
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -24,6 +24,9 @@
package org.foray.font.format;
+/**
+ * A TTF Font Mtx entry.
+ */
class TTFMtxEntry {
int wx;
int lsb;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -30,6 +30,9 @@
import java.io.IOException;
+/**
+ * A TTF Font table directory entry.
+ */
class TTFTableDirEntry {
/**
Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutputFactory.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutputFactory.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutputFactory.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -30,6 +30,9 @@
import org.axsl.fontR.FontUse;
import org.axsl.fontR.output.FontOutputFactory;
+/**
+ * Abstract superclass for the FOray FontOutputFactory implementations.
+ */
public abstract class FOrayFontOutputFactory implements FontOutputFactory {
public FOrayFontOutputFactory() {
Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDFFactory.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDFFactory.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDFFactory.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -30,6 +30,9 @@
import org.axsl.fontR.FontUse;
import org.axsl.fontR.output.FontOutput;
+/**
+ * Factory for creating instances of FontOutput for PDF output.
+ */
public class FOrayFontPDFFactory extends FOrayFontOutputFactory {
/**
Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPSFactory.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPSFactory.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPSFactory.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -30,6 +30,9 @@
import org.axsl.fontR.FontUse;
import org.axsl.fontR.output.FontOutput;
+/**
+ * Factory for creating instances of FontOutput for PostScript output.
+ */
public class FOrayFontPSFactory extends FOrayFontOutputFactory {
/**
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-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -39,6 +39,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
+/**
+ * The "alignment-adjust" property in XSL-FO.
+ */
public class AlignmentAdjust extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -34,6 +34,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
+/**
+ * The "alignment-baseline" property in XSL-FO.
+ */
public class AlignmentBaseline extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -37,6 +37,9 @@
import java.util.StringTokenizer;
+/**
+ * The "azimuth" property in XSL-FO.
+ */
public class Azimuth extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -39,6 +39,9 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
+/**
+ * The "background" property in XSL-FO.
+ */
public class Background extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundColor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundColor.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundColor.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -31,6 +31,9 @@
import org.axsl.common.Constants;
+/**
+ * The "background-color" property in XSL-FO.
+ */
public class BackgroundColor extends Color {
public static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -37,6 +37,9 @@
import org.axsl.graphicR.Graphic;
import org.axsl.graphicR.GraphicException;
+/**
+ * The "background-image" property in XSL-FO.
+ */
public class BackgroundImage extends Property {
/** Cache the graphic in case it is requested more than once. */
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-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -37,7 +37,9 @@
import org.axsl.foR.FOContext;
import org.axsl.fontR.FontUse;
-
+/**
+ * The "baseline-shift" property in XSL-FO.
+ */
public class BaselineShift extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -34,7 +34,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * A boolean (true, false) property in XSL-FO.
+ */
public class Boolean extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -38,6 +38,9 @@
import java.awt.Color;
import java.util.StringTokenizer;
+/**
+ * The "border-color" property in XSL-FO.
+ */
public class BorderColor extends Property {
public BorderColor(final PropertyList propertyList, final short enumeration,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -42,6 +42,10 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
+/**
+ * The "border-before-precedence", "border-after-precedence",
+ * "border-start-precedence", and "border-end-precedence" properties in XSL-FO.
+ */
public class BorderPrecedence extends Property {
public static final int FORCE_VALUE = 2147483647;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -37,6 +37,9 @@
import java.util.StringTokenizer;
+/**
+ * The "border-style" property in XSL-FO.
+ */
public class BorderStyle extends Property {
protected static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -40,6 +40,9 @@
import java.util.StringTokenizer;
+/**
+ * The "border-width" property in XSL-FO.
+ */
public class BorderWidth extends Property {
protected static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -30,7 +30,9 @@
import org.foray.fotree.value.DtString;
import org.foray.fotree.value.PropertyValue;
-
+/**
+ * The "case-title" property in XSL-FO.
+ */
public class CaseTitle extends Property {
public CaseTitle(final PropertyList propertyList, final short enumeration,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -36,6 +36,9 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.Shape;
+/**
+ * The "clip" property in XSL-FO.
+ */
public class Clip extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -35,7 +35,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "column-count" property in XSL-FO.
+ */
public class ColumnCount extends Property {
private static final short[] validKeywords = {
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-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -37,7 +37,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "column-gap" property in XSL-FO.
+ */
public class ColumnGap extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -35,7 +35,9 @@
import org.axsl.foR.FOContext;
-
+/**
+ * The "column-number" property in XSL-FO.
+ */
public class ColumnNumber extends Property {
public ColumnNumber(final PropertyList propertyList,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -35,7 +35,9 @@
import org.axsl.foR.FOContext;
-
+/**
+ * The "column-width" property in XSL-FO.
+ */
public class ColumnWidth extends Property {
public ColumnWidth(final PropertyList propertyList, final short enumeration,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -36,7 +36,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "content-width" and "content-height" properties in XSL-FO.
+ */
public class ContentDimension extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -34,6 +34,9 @@
import org.axsl.common.Constants;
+/**
+ * The "content-type" property in XSL-FO.
+ */
public class ContentType extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -35,7 +35,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "country" property in XSL-FO.
+ */
public class Country extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -35,7 +35,9 @@
import org.axsl.foR.FOContext;
-
+/**
+ * The "destination-placement-offset" property in XSL-FO.
+ */
public class DestinationPlacementOffset extends Property {
public DestinationPlacementOffset(final PropertyList propertyList,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -34,7 +34,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "display-align" property in XSL-FO.
+ */
public class DisplayAlign extends Property {
private static final short[] validKeywords = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-08-30 14:36:27 UTC (rev 7845)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-09-01 01:26:03 UTC (rev 7846)
@@ -34,7 +34,9 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-
+/**
+ * The "dominant-baseline" property ...
[truncated message content] |
|
From: <vic...@us...> - 2006-09-02 17:45:53
|
Revision: 7851
http://svn.sourceforge.net/foray/?rev=7851&view=rev
Author: victormote
Date: 2006-09-02 10:45:45 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Conform to axsl changes that create a PageMasterResolver class that handle the layout-time issues of keeping track of which page master should be used next.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
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-02 17:30:24 UTC (rev 7850)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-09-02 17:45:45 UTC (rev 7851)
@@ -30,6 +30,7 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.FObj;
+import org.axsl.foR.fo.PageMasterResolver;
import org.axsl.foR.fo.PageSequence;
import org.axsl.foR.fo.RegionBody;
import org.axsl.foR.fo.SimplePageMaster;
@@ -58,6 +59,8 @@
private ArrayList currentPageSequenceMarkers = new ArrayList();
+ private PageMasterResolver pageMasterResolver;
+
/**
* Constructor.
* @param pageSeq The "cousin" PageSequence object for which this
@@ -66,6 +69,7 @@
*/
public PageCollection(final PageSequence pageSeq, final AreaTree areaTree) {
super(pageSeq, areaTree);
+ this.pageMasterResolver = pageSeq.makePageMasterResolver();
}
/*
@@ -151,8 +155,7 @@
final PageSequence pageSeq = getPageSequence();
SimplePageMaster spm = null;
try {
- spm = pageSeq.getPageMaster(this.pageCount, getCurrentPageNumber(),
- false, isBlank);
+ spm = this.pageMasterResolver.getNextPageMaster(isBlank);
} catch (final FOTreeException e) {
throw new AreaWException(e);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 17:30:24 UTC (rev 7850)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 17:45:45 UTC (rev 7851)
@@ -199,34 +199,8 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.fo.SimplePageMaster getPageMaster(
- final int pageNumberInSequence, final int pageNumberInDocument,
- final boolean isLast, final boolean isBlank)
- throws FOTreeException {
- /*
- * TODO: This is the legacy code from the AreaTree, which is stateful.
- * Convert this to stateless logic. Specifically, the
- * pageNumberInSequence parameters should be used to simulate the series
- * of next-pages. Probably, each SubSequenceSpecifier should tell how
- * many pages it can generate, then we loop through them to find the
- * correct SimplePageMaster.
- */
- SimplePageMaster spm = this.simplePageMaster;
- if (spm != null) {
- return spm;
- }
- if (pageSequenceMaster != null) {
- final Flow flow = getFlow();
- spm = pageSequenceMaster.getNextSimplePageMaster(
- ((pageNumberInDocument % 2) == 1), isBlank);
- final Region region = (Region) spm.getRegionBody();
- if (!flow.traitFlowName().equals(region.traitRegionName())) {
- throw new FOTreeException("Flow '" + flow.traitFlowName()
- + "' does not map to the region-body in page-master '"
- + spm.traitMasterName() + "'");
- }
- }
- return spm;
+ public org.axsl.foR.fo.PageMasterResolver makePageMasterResolver() {
+ return new PageMasterResolver(this);
}
private void setupPagination() throws FOTreeException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-02 18:11:18
|
Revision: 7853
http://svn.sourceforge.net/foray/?rev=7853&view=rev
Author: victormote
Date: 2006-09-02 11:11:10 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Conform to axsl changes requiring the last page number as a parameter for creating a page master resolver.
Modified Paths:
--------------
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-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
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-02 18:10:09 UTC (rev 7852)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-09-02 18:11:10 UTC (rev 7853)
@@ -85,8 +85,17 @@
public org.axsl.areaW.PageCollection makePageCollection(
final PageSequence pageSequence) {
+ final int lastPageNumber;
+ final int collectionsProcessed = this.pageCollectionsProcessed.size();
+ if (collectionsProcessed > 0) {
+ final PageCollection lastPageCollection = (PageCollection)
+ this.pageCollectionsProcessed.get(collectionsProcessed - 1);
+ lastPageNumber = lastPageCollection.getLastPageNumber();
+ } else {
+ lastPageNumber = 0;
+ }
final PageCollection pageCollection = new PageCollection(pageSequence,
- this);
+ this, lastPageNumber);
pageCollectionsProcessed.add(pageCollection);
return pageCollection;
}
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-02 18:10:09 UTC (rev 7852)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-09-02 18:11:10 UTC (rev 7853)
@@ -55,7 +55,7 @@
* currentPageNumber shows the next <em>expected</em> page number to be
* created. The last page number assigned is one less.
*/
- public int currentPageNumber;
+ private int currentPageNumber;
private ArrayList currentPageSequenceMarkers = new ArrayList();
@@ -67,9 +67,11 @@
* PageCollection is created.
* @param areaTree {@inheritDoc}
*/
- public PageCollection(final PageSequence pageSeq, final AreaTree areaTree) {
+ public PageCollection(final PageSequence pageSeq, final AreaTree areaTree,
+ final int lastPageNumber) {
super(pageSeq, areaTree);
- this.pageMasterResolver = pageSeq.makePageMasterResolver();
+ this.pageMasterResolver = pageSeq.makePageMasterResolver(
+ lastPageNumber);
}
/*
@@ -122,6 +124,10 @@
return currentPageNumber;
}
+ public int getLastPageNumber() {
+ return currentPageNumber - 1;
+ }
+
public ArrayList getCurrentPageSequenceMarkers() {
return this.currentPageSequenceMarkers;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 18:10:09 UTC (rev 7852)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 18:11:10 UTC (rev 7853)
@@ -199,8 +199,9 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.fo.PageMasterResolver makePageMasterResolver() {
- return new PageMasterResolver(this);
+ public org.axsl.foR.fo.PageMasterResolver makePageMasterResolver(
+ final int lastPageNumber) {
+ return new PageMasterResolver(this, lastPageNumber);
}
private void setupPagination() throws FOTreeException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-04 20:18:43
|
Revision: 7887
http://svn.sourceforge.net/foray/?rev=7887&view=rev
Author: victormote
Date: 2006-09-04 13:02:18 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Conform to axsl change: Make hyphenation character 21-bits.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java
trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -235,7 +235,7 @@
traitLetterSpacingOpt(), traitWordSpacingOpt());
}
- public int getCharWidth(final char c) {
+ public int getCharWidth(final int c) {
final FontUse fontUse = getPrimaryFont();
final Font font = getPrimaryFont().getFont();
fontUse.registerCharUsed(c);
@@ -1028,7 +1028,7 @@
return traitGeneratedBy().traitRefId(this);
}
- public char traitHyphenationCharacter() {
+ public int traitHyphenationCharacter() {
return traitGeneratedBy().traitHyphenationCharacter(this);
}
@@ -1089,7 +1089,7 @@
}
public int getHyphenWidth() {
- final char hyphenChar = traitHyphenationCharacter();
+ final int hyphenChar = traitHyphenationCharacter();
return getCharWidth(hyphenChar);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-09-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -24,6 +24,7 @@
package org.foray.area;
+import org.foray.common.StringUtilPre5;
import org.foray.common.XMLCharacter;
import org.axsl.areaR.RenderVisitor;
@@ -179,15 +180,27 @@
return new char[0];
}
int arraySize = this.backingSize - ignoreAtStart - ignoreAtEnd;
+ final int hyphenChar = this.traitHyphenationCharacter();
+ int discretionaryHyphenSize = 0;
if (this.hasDiscretionaryHyphen) {
- arraySize ++;
+ discretionaryHyphenSize = StringUtilPre5.charCount(hyphenChar);
}
+ arraySize += discretionaryHyphenSize;
final char[] returnChars = new char[arraySize];
System.arraycopy(rawText, this.backingOffset + ignoreAtStart,
returnChars, 0, returnChars.length);
if (this.hasDiscretionaryHyphen) {
- returnChars[returnChars.length - 1]
- = this.traitHyphenationCharacter();
+ if (discretionaryHyphenSize == 1) {
+ returnChars[returnChars.length - discretionaryHyphenSize]
+ = (char) this.traitHyphenationCharacter();
+ } else {
+ final String hyphenString = StringUtilPre5.newString(
+ new int[] {hyphenChar}, 0, 1);
+ final char[] hyphenChars = hyphenString.toCharArray();
+ System.arraycopy(hyphenChars, 0, returnChars,
+ returnChars.length - hyphenChars.length,
+ hyphenChars.length);
+ }
}
/* Apply faux small-caps, if appropriate. */
if (hasFauxSmallCaps) {
@@ -414,7 +427,7 @@
* @param c The character to be tested.
* @return True iff word-spacing should be added for this character.
*/
- private boolean wordSpacingApplies(final char c) {
+ private boolean wordSpacingApplies(final int c) {
switch (c) {
case ' ': {
return true;
@@ -515,7 +528,7 @@
* @return The width of c plus any word-spacing or letter-spacing that is
* related to it.
*/
- private int charWidth(final char c, final boolean lastCharOnLine) {
+ private int charWidth(final int c, final boolean lastCharOnLine) {
FontUse fontUse = this.getPrimaryFont();
if (! fontUse.glyphAvailable(c)) {
fontUse = this.getSecondaryFont(c);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-09-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -201,14 +201,14 @@
/**
* {@inheritDoc}
*/
- public char inlineHyphenationCharacter() {
+ public int inlineHyphenationCharacter() {
return realLineText.inlineHyphenationCharacter(this.context);
}
/**
* {@inheritDoc}
*/
- public char inlineHyphenationCharacter(final FOContext context) {
+ public int inlineHyphenationCharacter(final FOContext context) {
return realLineText.inlineHyphenationCharacter(context);
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-09-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -635,11 +635,11 @@
return effectiveParent.traitHyphenationPushCharacterCount(context);
}
- public char inlineHyphenationCharacter() {
+ public int inlineHyphenationCharacter() {
return this.inlineHyphenationCharacter(null);
}
- public char inlineHyphenationCharacter(final FOContext context) {
+ public int inlineHyphenationCharacter(final FOContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitHyphenationCharacter(context);
}
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 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -1521,7 +1521,7 @@
/**
* {@inheritDoc}
*/
- public char traitHyphenationCharacter(final FOContext context) {
+ public int traitHyphenationCharacter(final FOContext context) {
return propertyList.getHyphenationCharacter(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 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -1967,7 +1967,7 @@
Constants.FOPROP_HYPHENATE);
}
- public char getHyphenationCharacter(final FOContext context) {
+ public int getHyphenationCharacter(final FOContext context) {
final Character property = (Character) getProperty(Constants
.FOPROP_HYPHENATION_CHARACTER);
if (property != null) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-09-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -72,7 +72,7 @@
}
/* For "hyphenation-character", which can be inherited. */
- public char getValue(final FOContext context, final FObj fobj) {
+ public int getValue(final FOContext context, final FObj fobj) {
if (this.value instanceof PropertyKeyword) {
switch (propertyType) {
case Constants.FOPROP_HYPHENATION_CHARACTER: {
@@ -98,7 +98,7 @@
}
/* For properties that can be inherited. */
- public static char getValueNoInstance(final FOContext context,
+ public static int getValueNoInstance(final FOContext context,
final short propertyType, final FObj fobj) {
switch (propertyType) {
case Constants.FOPROP_HYPHENATION_CHARACTER: {
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-04 18:24:24 UTC (rev 7886)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java 2006-09-04 20:02:18 UTC (rev 7887)
@@ -212,7 +212,7 @@
}
public int getHyphenWidth(final LineText lineText) {
- final char hyphenChar = lineText.inlineHyphenationCharacter();
+ final int hyphenChar = lineText.inlineHyphenationCharacter();
return getCharWidth(lineText, hyphenChar);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-04 22:42:44
|
Revision: 7890
http://svn.sourceforge.net/foray/?rev=7890&view=rev
Author: victormote
Date: 2006-09-04 15:42:36 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Conform to axsl changes: Remove unneeded method.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
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-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-04 22:01:46 UTC (rev 7889)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-04 22:42:36 UTC (rev 7890)
@@ -340,7 +340,8 @@
// Start at the padding-rectangle origin.
int x = prOriginX();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
- final boolean goingRight = (this.traitIPDirection()
+ // Our BP Axis is vertical
+ final boolean goingRight = (this.traitIPDirectionOdd()
== Constants.DIRECTION_LEFT_TO_RIGHT);
if (goingRight) {
x -= this.traitBorderStartWidth();
@@ -369,6 +370,7 @@
// Start at the padding-rectangle origin.
int y = prOriginY();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ // Our BP Axis is vertical
final boolean goingDown = (this.traitBPDirection()
== Constants.DIRECTION_TOP_TO_BOTTOM);
if (goingDown) {
@@ -378,7 +380,7 @@
}
} else {
// Our BP Axis is horizontal
- final boolean goingUp = (this.traitIPDirection()
+ final boolean goingUp = (this.traitIPDirectionOdd()
== Constants.DIRECTION_BOTTOM_TO_TOP);
if (goingUp) {
y -= this.traitBorderStartWidth();
@@ -438,7 +440,8 @@
// Start at the content-rectangle origin.
int x = crOriginX();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
- final boolean goingRight = (this.traitIPDirection()
+ // Our BP Axis is vertical
+ final boolean goingRight = (this.traitIPDirectionOdd()
== Constants.DIRECTION_LEFT_TO_RIGHT);
if (goingRight) {
x -= this.traitPaddingStart();
@@ -778,14 +781,18 @@
return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD());
}
- public int traitBPDirection() {
+ public byte traitBPDirection() {
return traitGeneratedBy().traitBPDirection(this);
}
- public int traitIPDirection() {
- return traitGeneratedBy().traitIPDirection(this);
+ public byte traitIPDirectionOdd() {
+ return traitGeneratedBy().traitIPDirectionOdd(this);
}
+ public byte traitIPDirectionEven() {
+ return traitGeneratedBy().traitIPDirectionEven(this);
+ }
+
private int nearestBaseBPD() {
int nearestBPD = -1;
final Area nearest = this.ancestorGeneratedByBlockLevelFO();
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:01:46 UTC (rev 7889)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-09-04 22:42:36 UTC (rev 7890)
@@ -1647,13 +1647,6 @@
/**
* {@inheritDoc}
*/
- public byte traitIPDirection(final FOContext context) {
- return propertyList.traitIPDirection(context);
- }
-
- /**
- * {@inheritDoc}
- */
public byte traitBPDirection(final FOContext context) {
return propertyList.traitBPDirection(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:01:46 UTC (rev 7889)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-09-04 22:42:36 UTC (rev 7890)
@@ -2150,15 +2150,6 @@
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
*/
- public byte traitIPDirection(final FOContext context) {
- return getWritingMode(context).getIPDirectionOdd();
- }
-
- /**
- * @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 traitBPDirection(final FOContext context) {
return getWritingMode(context).getBPDirection();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
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.
|
|
From: <vic...@us...> - 2006-09-05 23:14:44
|
Revision: 7917
http://svn.sourceforge.net/foray/?rev=7917&view=rev
Author: victormote
Date: 2006-09-05 16:14:35 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Standardize document ordering, as reported by checkstyle.
Modified Paths:
--------------
trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java 2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java 2006-09-05 23:14:35 UTC (rev 7917)
@@ -53,19 +53,9 @@
private int pageWidth;
/**
- * the current vertical position in millipoints from bottom
- */
- protected int currentYPosition = 0;
-
- /**
- * the current horizontal position in millipoints from left
- */
- protected int currentXPosition = 0;
-
- /**
* the MIF Document being created
*/
- protected MIFDocument mifDoc;
+ private MIFDocument mifDoc;
/* is a table currently open? */
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 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-09-05 23:14:35 UTC (rev 7917)
@@ -35,16 +35,16 @@
*/
public abstract class OutputTarget implements org.axsl.output.OutputTarget {
- OutputStream outputStream;
+ private OutputStream outputStream;
private String applicationName;
private String applicationNameShort;
private String applicationVersion;
private String developerURLShort;
- boolean strokeSVGText;
- Log logger;
- FontConsumer fontConsumer;
+ private boolean strokeSVGText;
+ private Log logger;
+ private FontConsumer fontConsumer;
- protected OutputConfig options;
+ private OutputConfig options;
/**
*
@@ -163,4 +163,11 @@
this.fontConsumer = fontConsumer;
}
+ /**
+ * @return Returns the options.
+ */
+ public OutputConfig getOptions() {
+ return this.options;
+ }
+
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-09-05 23:14:35 UTC (rev 7917)
@@ -97,18 +97,19 @@
}
private void addEncryption() {
- if (this.options == null) {
+ if (this.getOptions() == null) {
return;
}
// Process encryption options, if any exist
boolean encrypt = false;
- final String oPassword = this.options.optionPDFOwnerPassword();
- final String uPassword = this.options.optionPDFUserPassword();
- final boolean allowPrint = this.options.optionPDFUserPrint();
- final boolean allowCopyContent = this.options.optionPDFUserCopy();
- final boolean allowEditContent = this.options.optionPDFUserModify();
+ final String oPassword = this.getOptions().optionPDFOwnerPassword();
+ final String uPassword = this.getOptions().optionPDFUserPassword();
+ final boolean allowPrint = this.getOptions().optionPDFUserPrint();
+ final boolean allowCopyContent = this.getOptions().optionPDFUserCopy();
+ final boolean allowEditContent =
+ this.getOptions().optionPDFUserModify();
final boolean allowEditAnnotations =
- this.options.optionPDFUserAnnotate();
+ this.getOptions().optionPDFUserAnnotate();
if (oPassword != null) {
encrypt = true;
@@ -133,7 +134,7 @@
* {@inheritDoc}
*/
public void startOutput() throws IOException {
- final String pdfVersion = this.options.optionPDFVersion();
+ final String pdfVersion = this.getOptions().optionPDFVersion();
if (pdfVersion != null) {
final int pdfVersionConstant = PDFUtility.integralVersion(
pdfVersion);
@@ -150,7 +151,7 @@
this.pdfDoc.setCreationDate(now);
// setup Encryption
addEncryption();
- final List filters = this.options.optionPDFFilters();
+ final List filters = this.getOptions().optionPDFFilters();
for (int i = 0; i < filters.size(); i++) {
final String filter = (String)filters.get(i);
pdfDoc.addDefaultFilter(filter);
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 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-09-05 23:14:35 UTC (rev 7917)
@@ -504,8 +504,8 @@
getLogger().info("rendering areas to TEXT");
currentStream = new TXTStream(this.getOutputStream());
String encoding;
- if (options != null) {
- encoding = options.optionTXTEncoding();
+ if (this.getOptions() != null) {
+ encoding = this.getOptions().optionTXTEncoding();
try {
" ".getBytes(encoding);
} catch (final UnsupportedEncodingException uee) {
Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-09-05 23:14:35 UTC (rev 7917)
@@ -535,10 +535,10 @@
}
private boolean isCoarseXml() {
- if (options == null) {
+ if (this.getOptions() == null) {
return false;
}
- return options.optionATSparse();
+ return this.getOptions().optionATSparse();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-06 03:10:51
|
Revision: 7932
http://svn.sourceforge.net/foray/?rev=7932&view=rev
Author: victormote
Date: 2006-09-05 19:28:00 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Conform to axsl change, which moved some logic previously in layout to the AreaTree.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-09-06 01:28:04 UTC (rev 7931)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-09-06 02:28:00 UTC (rev 7932)
@@ -194,4 +194,49 @@
return (TableRowContainer) this.getParent();
}
+ /**
+ * {@inheritDoc}
+ */
+ public void optimize() {
+ adjustDisplayAlign();
+ }
+
+ /**
+ * Use the "display-align" trait to position the cell contents vertically
+ * within the cell.
+ */
+ private void adjustDisplayAlign() {
+ /* Compute the difference between my height and the row height. */
+ final int delta = this.getTableRow().getProgressionDimension()
+ - this.getProgressionDimension();
+ if (delta <= 0) {
+ return;
+ }
+ short displayAlign = this.traitGeneratedBy().traitDisplayAlign(
+ this);
+ if (displayAlign == Constants.FOVAL_AUTO) {
+ /* TODO: This is not right. */
+ displayAlign = this.traitGeneratedBy().traitAlignmentBaseline(
+ this);
+ }
+ switch (displayAlign) {
+ case Constants.FOVAL_CENTER:
+ /* Increase cell padding before and after. */
+ this.setCenteringPaddingTop(delta / 2);
+ this.setCenteringPaddingBottom(delta - delta / 2);
+ break;
+ case Constants.FOVAL_AFTER:
+ /* Increase cell padding before. */
+ this.setCenteringPaddingTop(delta);
+ break;
+ case Constants.FOVAL_BEFORE:
+ /* Increase cell padding after. */
+ this.setCenteringPaddingBottom(delta);
+ default:
+ /* No adjustment needed. */
+ break;
+ }
+
+ }
+
}
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-06 01:28:04 UTC (rev 7931)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-09-06 02:28:00 UTC (rev 7932)
@@ -83,31 +83,6 @@
areaContainer.incrementProgressionDimension(delta);
return;
}
- if (delta <= 0) {
- return;
- }
- // Vertical cell alignment
- short verticalAlign = getReal().traitDisplayAlign(context);
- if (verticalAlign == Constants.FOVAL_AUTO) {
- // Depends on all cells starting in row
- verticalAlign = getReal().traitAlignmentBaseline(context);
- }
- switch (verticalAlign) {
- case Constants.FOVAL_CENTER:
- // Increase cell padding before and after and change
- areaContainer.setCenteringPaddingTop(delta / 2);
- areaContainer.setCenteringPaddingBottom(delta - delta / 2);
- break;
- case Constants.FOVAL_AFTER:
- // Increase cell padding before and change
- areaContainer.setCenteringPaddingTop(delta);
- break;
- case Constants.FOVAL_BEFORE:
- // cellArea.increaseHeight(delta);
- areaContainer.setCenteringPaddingBottom(delta);
- default: // OK
- break;
- }
}
TableCell getReal() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-06 14:43:39
|
Revision: 7934
http://svn.sourceforge.net/foray/?rev=7934&view=rev
Author: victormote
Date: 2006-09-06 07:43:32 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
Conform to axsl change: Rename method for consistency and brevity.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-09-06 02:29:40 UTC (rev 7933)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-09-06 14:43:32 UTC (rev 7934)
@@ -96,7 +96,7 @@
}
}
- public void optimizeLine() {
+ public void optimize() {
if (this.optimized) {
return;
}
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-06 02:29:40 UTC (rev 7933)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-09-06 14:43:32 UTC (rev 7934)
@@ -481,7 +481,7 @@
* @param area area to render
*/
public void render(final LineArea area) {
- area.optimizeLine();
+ area.optimize();
renderChildren(area);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-06 15:43:16
|
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.
|
|
From: <vic...@us...> - 2006-09-07 19:24:44
|
Revision: 7941
http://svn.sourceforge.net/foray/?rev=7941&view=rev
Author: victormote
Date: 2006-09-07 12:24:21 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.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/encode/GlyphListAGL.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -34,7 +34,7 @@
public class CharSetWindowsANSI extends CharSet {
public CharSetWindowsANSI() {
- super("WindowsANSI", EncodingWinAnsi.codePoints);
+ super("WindowsANSI", EncodingWinAnsi.CODE_POINTS);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -48,19 +48,19 @@
final int colorSpace = color.getColorSpace().getType();
switch (colorSpace) {
case ColorSpace.TYPE_RGB: {
- return toPS_RGB(color, fillNotStroke, eol);
+ return rgbToPS(color, fillNotStroke, eol);
}
case ColorSpace.TYPE_CMYK: {
- return toPS_CMYK(color, fillNotStroke, eol);
+ return cmykToPS(color, fillNotStroke, eol);
}
default: {
- return toPS_Gray(color, fillNotStroke, eol);
+ return grayToPS(color, fillNotStroke, eol);
}
}
}
/* Colorspace is RGB. */
- private static String toPS_RGB(final Color color,
+ private static String rgbToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
@@ -98,7 +98,7 @@
}
/* Colorspace is CMYK. */
- private static String toPS_CMYK(final Color color,
+ private static String cmykToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
final float[] cmykColors = color.getComponents(null);
@@ -117,7 +117,7 @@
}
/* Colorspace is DeviceGray. */
- private static String toPS_Gray(final Color color,
+ private static String grayToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
final float[] grayColors = color.getComponents(null);
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -78,10 +78,10 @@
sb.append(PSErrorDict.ERROR_NAMES[errorCode]);
sb.append(" (operator: ");
if (offendingOperator < 1
- || offendingOperator > PSOperator.operatorNames.length) {
+ || offendingOperator > PSOperator.OPERATOR_NAMES.length) {
sb.append("unknown");
} else {
- sb.append(PSOperator.operatorNames[offendingOperator]);
+ sb.append(PSOperator.OPERATOR_NAMES[offendingOperator]);
}
sb.append(") ");
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -392,7 +392,7 @@
/**
* The index into this array is the matching OPER_ constant.
*/
- protected static final String[] operatorNames = new String[] {
+ protected static final String[] OPERATOR_NAMES = new String[] {
"", // Element 0 is blank
"<<",
">>",
@@ -776,7 +776,7 @@
* @return The integer equivalent of <code>name</code>.
*/
public static short mapNameToEnum(final String name) {
- return (short) Arrays.binarySearch(operatorNames, name);
+ return (short) Arrays.binarySearch(OPERATOR_NAMES, name);
}
/**
@@ -786,10 +786,10 @@
*/
public static String mapEnumToName(final short enumeratedOperator) {
if (enumeratedOperator < 0
- || enumeratedOperator >= operatorNames.length) {
+ || enumeratedOperator >= OPERATOR_NAMES.length) {
return null;
}
- return operatorNames[enumeratedOperator];
+ return OPERATOR_NAMES[enumeratedOperator];
}
public boolean execute() throws PSException {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -55,8 +55,8 @@
void setPSInterpreter(final PSInterpreter interpreter) throws PSException {
this.interpreter = interpreter;
- for (short i = 1; i < PSOperator.operatorNames.length; i++) {
- final String operatorName = PSOperator.operatorNames[i];
+ for (short i = 1; i < PSOperator.OPERATOR_NAMES.length; i++) {
+ final String operatorName = PSOperator.OPERATOR_NAMES[i];
final PSName key = new PSName(interpreter, operatorName, true,
false);
final PSOperator value = new PSOperator(interpreter, this, i);
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -480,7 +480,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -698,7 +698,7 @@
0x2122 // #214 glyph: 0x99 \231
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -918,8 +918,8 @@
public EncodingCE() {
super("CEEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingCE.codePoints,
- EncodingCE.codePointIndexes);
+ EncodingCE.CODE_POINTS,
+ EncodingCE.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -378,7 +378,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -546,7 +546,7 @@
0xfb04 // #164 glyph: 0x5a \132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -716,8 +716,8 @@
public EncodingExpert() {
super("ExpertEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingExpert.codePoints,
- EncodingExpert.codePointIndexes);
+ EncodingExpert.CODE_POINTS,
+ EncodingExpert.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -221,7 +221,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x002c, // [1] glyph: 0x002c \0054
0x002d, // [2] glyph: 0x002d \0055
@@ -310,7 +310,7 @@
0xfb04 // [85] glyph: 0x005a \0132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x002c, // [1]
0x002d, // [2]
@@ -401,8 +401,8 @@
public EncodingExpertSubset() {
super("ExpertSubsetEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingExpertSubset.codePoints,
- EncodingExpertSubset.codePointIndexes);
+ EncodingExpertSubset.CODE_POINTS,
+ EncodingExpertSubset.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -149,7 +149,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x0100, // [1] glyph: 0x0021 \0041
0x0101, // [2] glyph: 0x0032 \0062
@@ -199,7 +199,7 @@
0xfb02 // [46] glyph: 0x0038 \0070
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x0021, // [1]
0x0032, // [2]
@@ -251,8 +251,8 @@
public EncodingFOrayLatinExtra() {
super("FOrayLatinExtraEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingFOrayLatinExtra.codePoints,
- EncodingFOrayLatinExtra.codePointIndexes);
+ EncodingFOrayLatinExtra.CODE_POINTS,
+ EncodingFOrayLatinExtra.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -448,7 +448,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -651,7 +651,7 @@
0x2212 // #199 glyph: 0x2d \55
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -856,8 +856,8 @@
public EncodingISOLatin1() {
super("ISOLatin1Encoding", GlyphList.standardSourceGlyphLists(),
- EncodingISOLatin1.codePoints,
- EncodingISOLatin1.codePointIndexes);
+ EncodingISOLatin1.CODE_POINTS,
+ EncodingISOLatin1.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -378,7 +378,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -546,7 +546,7 @@
0xfb04 // #164 glyph: 0x5a \132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -716,8 +716,8 @@
public EncodingMacExpert() {
super("MacExpertEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingMacExpert.codePoints,
- EncodingMacExpert.codePointIndexes);
+ EncodingMacExpert.CODE_POINTS,
+ EncodingMacExpert.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -462,7 +462,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -672,7 +672,7 @@
0xfb02 // #206 glyph: 0xdf \337
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -884,8 +884,8 @@
public EncodingMacRoman() {
super("MacRomanEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingMacRoman.codePoints,
- EncodingMacRoman.codePointIndexes);
+ EncodingMacRoman.CODE_POINTS,
+ EncodingMacRoman.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -571,7 +571,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0000, // [0] glyph: 0x0000 \0000
0x0000, // [1] glyph: 0x0000 \0000
0x0000, // [2] glyph: 0x0000 \0000
@@ -832,7 +832,7 @@
0xfb02 // [257] glyph: 0x00c1 \0301
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0000, // [0]
0x0000, // [1]
0x0000, // [2]
@@ -1095,8 +1095,8 @@
public EncodingMacStandard() {
super(STANDARD_MACINTOSH_ORDERING, GlyphList.standardSourceGlyphLists(),
- EncodingMacStandard.codePoints,
- EncodingMacStandard.codePointIndexes);
+ EncodingMacStandard.CODE_POINTS,
+ EncodingMacStandard.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -506,7 +506,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -738,7 +738,7 @@
0xfb02 // #228 glyph: 0x94 \224
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -972,8 +972,8 @@
public EncodingPDFDoc() {
super("PDFDocEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingPDFDoc.codePoints,
- EncodingPDFDoc.codePointIndexes);
+ EncodingPDFDoc.CODE_POINTS,
+ EncodingPDFDoc.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -349,7 +349,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -501,7 +501,7 @@
0xfb02 // #148 glyph: 0xaf \257
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -655,8 +655,8 @@
public EncodingStandard() {
super("StandardEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingStandard.codePoints,
- EncodingStandard.codePointIndexes);
+ EncodingStandard.CODE_POINTS,
+ EncodingStandard.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -434,7 +434,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x23, // #2 glyph: 0x23 \43
@@ -626,7 +626,7 @@
0xf8fe // #188 glyph: 0xfe \376
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x23, // #2
@@ -820,8 +820,8 @@
public EncodingSymbol() {
super("SymbolEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingSymbol.codePoints,
- EncodingSymbol.codePointIndexes);
+ EncodingSymbol.CODE_POINTS,
+ EncodingSymbol.CODE_POINT_INDEXES);
}
public String predefinedPDFName() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -480,7 +480,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -699,7 +699,7 @@
0x2122 // #215 glyph: 0x99 \231
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -920,8 +920,8 @@
public EncodingWinAnsi() {
super("WinAnsiEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingWinAnsi.codePoints,
- EncodingWinAnsi.codePointIndexes);
+ EncodingWinAnsi.CODE_POINTS,
+ EncodingWinAnsi.CODE_POINT_INDEXES);
}
/**
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-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -47,7 +47,7 @@
*/
public class EncodingZapfDingbats extends EncodingVector {
- private static final GlyphList[] glyphListsUsed = {
+ private static final GlyphList[] GLYPH_LISTS_USED = {
GlyphList.getGlyphList("ZapfDingbats"),
/* We need the Adobe Glyph List to get the "space" char. */
GlyphList.getGlyphList("AGL")
@@ -465,7 +465,7 @@
};
*/
- private static final char[] codePoints = {
+ private static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x2192, // [1] glyph: 0x00d5 \0325
0x2194, // [2] glyph: 0x00d6 \0326
@@ -670,7 +670,7 @@
0x27be // [201] glyph: 0x00fe \0376
};
- private static final char[] codePointIndexes = {
+ private static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x00d5, // [1]
0x00d6, // [2]
@@ -876,9 +876,9 @@
};
public EncodingZapfDingbats() {
- super("ZapfDingbatsEncoding", glyphListsUsed,
- EncodingZapfDingbats.codePoints,
- EncodingZapfDingbats.codePointIndexes);
+ super("ZapfDingbatsEncoding", GLYPH_LISTS_USED,
+ EncodingZapfDingbats.CODE_POINTS,
+ EncodingZapfDingbats.CODE_POINT_INDEXES);
}
public String predefinedPDFName() {
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-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -43,7 +43,7 @@
* instance. */
private static HashMap glyphListMap = new HashMap();
- private static final GlyphList[] standardSourceGlyphLists = {
+ private static final GlyphList[] STANDARD_SOURCE_GLYPH_LISTS = {
GlyphList.getGlyphList("AGL")
};
@@ -253,7 +253,7 @@
* @return Returns the standardSourceGlyphLists.
*/
public static GlyphList[] standardSourceGlyphLists() {
- return standardSourceGlyphLists;
+ return STANDARD_SOURCE_GLYPH_LISTS;
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -61,7 +61,7 @@
public class GlyphListAGL extends GlyphList {
// Note: This array must be sorted alphabatically (used in binary search).
- public static final String[] agl = {
+ public static final String[] AGL = {
"A",
"AE",
"AEacute",
@@ -4346,8 +4346,8 @@
};
protected GlyphListAGL() {
- super("AGL", GlyphListAGL.agl, GlyphListAGL2.charForGlyph,
- GlyphListAGL3.charList, GlyphListAGL4.glyphNameIndex);
+ super("AGL", GlyphListAGL.AGL, GlyphListAGL2.CHAR_FOR_GLYPH,
+ GlyphListAGL3.CHAR_LIST, GlyphListAGL4.GLYPH_NAME_INDEX);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -36,7 +36,7 @@
* This array contains the Unicode code points that correspond to the glyph
* names that are found in GlyphList.agl.
*/
- public static final char[][] charForGlyph = {
+ public static final char[][] CHAR_FOR_GLYPH = {
{ 0x0041 },
{ 0x00C6 },
{ 0x01FC },
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -32,7 +32,7 @@
*/
public class GlyphListAGL3 {
- public static final char[] charList = {
+ public static final char[] CHAR_LIST = {
0x0001,
0x0002,
0x0003,
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -32,7 +32,7 @@
*/
public class GlyphListAGL4 {
- public static final short[] glyphNameIndex = {
+ public static final short[] GLYPH_NAME_INDEX = {
1454,
1453,
1443,
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -35,7 +35,7 @@
public class GlyphListZapfDingbats extends GlyphList {
// Note: This array must be sorted alphabatically (used in binary search).
- public static final String[] glyphList = {
+ public static final String[] GLYPH_LIST = {
"a1",
"a10",
"a100",
@@ -239,7 +239,7 @@
"a99"
};
- public static final char[][] charForGlyph = {
+ public static final char[][] CHAR_FOR_GLYPH = {
{ 0x2701 },
{ 0x2721 },
{ 0x275e },
@@ -443,7 +443,7 @@
{ 0x275d }
};
- public static final char[] charList = {
+ public static final char[] CHAR_LIST = {
0x2192,
0x2194,
0x2195,
@@ -647,7 +647,7 @@
0x27be
};
- public static final short[] glyphNameIndex = {
+ public static final short[] GLYPH_NAME_INDEX = {
65,
67,
68,
@@ -852,10 +852,10 @@
};
protected GlyphListZapfDingbats() {
- super("ZapfDingbats", GlyphListZapfDingbats.glyphList,
- GlyphListZapfDingbats.charForGlyph,
- GlyphListZapfDingbats.charList,
- GlyphListZapfDingbats.glyphNameIndex);
+ super("ZapfDingbats", GlyphListZapfDingbats.GLYPH_LIST,
+ GlyphListZapfDingbats.CHAR_FOR_GLYPH,
+ GlyphListZapfDingbats.CHAR_LIST,
+ GlyphListZapfDingbats.GLYPH_NAME_INDEX);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Fi...
[truncated message content] |
|
From: <vic...@us...> - 2006-09-07 23:32:56
|
Revision: 7977
http://svn.sourceforge.net/foray/?rev=7977&view=rev
Author: victormote
Date: 2006-09-07 16:32:45 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
trunk/foray/scripts/checkstyle-config.xml
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-07 23:30:16 UTC (rev 7976)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java 2006-09-07 23:32:45 UTC (rev 7977)
@@ -570,7 +570,6 @@
token = in.readLine().trim();
long starttime = 0;
int counter = 0;
- ;
try {
final BufferedReader reader =
new BufferedReader(new FileReader(token));
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-07 23:30:16 UTC (rev 7976)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-09-07 23:32:45 UTC (rev 7977)
@@ -867,7 +867,6 @@
mif += "\n<TblTRuling `Default'>";
mif += "\n> #End TblFormat";
- ;
mif += "\n\t<TblNumColumns " + tblColumns.size() + " >";
stream.write(mif.getBytes());
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java 2006-09-07 23:30:16 UTC (rev 7976)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java 2006-09-07 23:32:45 UTC (rev 7977)
@@ -373,7 +373,7 @@
hash[i++] = (byte) (number >>> 8);
hash[i++] = (byte) (number >>> 16);
hash[i++] = (byte) (generation >>> 0);
- hash[i++] = (byte) (generation >>> 8);;
+ hash[i++] = (byte) (generation >>> 8);
return encryptWithHash(data,hash,hash.length);
}
Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:30:16 UTC (rev 7976)
+++ trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:32:45 UTC (rev 7977)
@@ -114,9 +114,7 @@
</module>
<module name="DefaultComesLast"/>
- <module name="EmptyStatement">
- <property name="severity" value="ignore"/>
- </module>
+ <module name="EmptyStatement"/>
<module name="FallThrough">
<property name="severity" value="ignore"/>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-07 23:44:30
|
Revision: 7978
http://svn.sourceforge.net/foray/?rev=7978&view=rev
Author: victormote
Date: 2006-09-07 16:44:10 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -193,8 +193,10 @@
public int dotLeaderTextOffset() {
switch (traitLeaderAlignment()) {
case Constants.FOVAL_REFERENCE_AREA: {
+ break;
}
case Constants.FOVAL_PAGE: {
+ break;
}
}
/*
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -236,6 +236,7 @@
case Constants.FOVAL_BEFORE:
/* Increase cell padding after. */
this.setCenteringPaddingBottom(delta);
+ break;
default:
/* No adjustment needed. */
break;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -437,6 +437,7 @@
}
case KW_CHARACTER_SET: {
characterSet();
+ break;
}
case KW_CHARACTERS: {
break;
@@ -530,6 +531,7 @@
}
case KW_IS_FIXED_PITCH: {
isFixedPitch();
+ break;
}
case KW_IS_FIXED_V: {
break;
@@ -635,9 +637,11 @@
}
case KW_STD_HW: {
stdHW();
+ break;
}
case KW_STD_VW: {
stdVW();
+ break;
}
case KW_TRACK_KERN: {
break;
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-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -1614,14 +1614,17 @@
case Property.MINIMUM: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_MIN_WIDTH);
+ break;
}
case Property.MAXIMUM: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_MAX_WIDTH);
+ break;
}
default: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_WIDTH);
+ break;
}
}
} else if (absoluteAxis == Constants.AXIS_VERTICAL){
@@ -1629,14 +1632,17 @@
case Property.MINIMUM: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_MIN_HEIGHT);
+ break;
}
case Property.MAXIMUM: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_MAX_HEIGHT);
+ break;
}
default: {
absDimProperty = (AbsoluteDimension) getProperty
(Constants.FOPROP_HEIGHT);
+ break;
}
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -113,6 +113,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
colorFound = true;
+ break;
}
case Constants.FOPROP_BACKGROUND_IMAGE: {
if (imageFound) {
@@ -122,6 +123,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
imageFound = true;
+ break;
}
case Constants.FOPROP_BACKGROUND_REPEAT: {
if (repeatFound) {
@@ -131,6 +133,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
repeatFound = true;
+ break;
}
case Constants.FOPROP_BACKGROUND_ATTACHMENT: {
if (attachmentFound) {
@@ -140,6 +143,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
attachmentFound = true;
+ break;
}
case Constants.FOPROP_BACKGROUND_POSITION: {
if (positionFound) {
@@ -156,6 +160,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
positionFound = true;
+ break;
}
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -145,6 +145,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
styleFound = true;
+ break;
}
case Constants.FOPROP_FONT_VARIANT: {
if (variantFound || sizeFound || lineHeightFound
@@ -155,6 +156,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
variantFound = true;
+ break;
}
case Constants.FOPROP_FONT_WEIGHT: {
if (weightFound || sizeFound || lineHeightFound
@@ -165,6 +167,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
weightFound = true;
+ break;
}
case Constants.FOPROP_FONT_SIZE: {
if (sizeFound || lineHeightFound || familyFound) {
@@ -174,6 +177,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
sizeFound = true;
+ break;
}
case Constants.FOPROP_LINE_HEIGHT: {
if (lineHeightFound || familyFound || ! sizeFound) {
@@ -186,6 +190,7 @@
positionArray[i], propertyFullName,
adjustedToken));
lineHeightFound = true;
+ break;
}
case Constants.FOPROP_FONT_FAMILY: {
if (familyFound || ! sizeFound) {
@@ -195,6 +200,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
familyFound = true;
+ break;
}
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -103,6 +103,7 @@
switch (axis) {
case Constants.AXIS_VERTICAL: {
index = 0;
+ break;
}
case Constants.AXIS_HORIZONTAL: {
if (collection.getCount() > 1) {
@@ -110,6 +111,7 @@
} else {
index = 0;
}
+ break;
}
}
final Property property = collection.getItem(index);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -104,6 +104,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
countryFound = true;
+ break;
}
case Constants.FOPROP_LANGUAGE: {
if (languageFound) {
@@ -113,6 +114,7 @@
positionArray[i], propertyFullName,
(String) tokenList.get(i)));
languageFound = true;
+ break;
}
}
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -380,6 +380,7 @@
readBuffer[index + 6]);
this.pixelWidth = combine2bytes(readBuffer[index + 7],
readBuffer[index + 8]);
+ break;
}
default: {
// Eat the segment marker and segment type bytes
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-09-07 23:44:10 UTC (rev 7978)
@@ -340,12 +340,14 @@
case CARRIAGE_RETURN: {
this.currentLine ++;
this.currentColumn = 1;
+ break;
}
case LINE_FEED: {
if (this.lastByteParsed != CARRIAGE_RETURN) {
this.currentLine ++;
this.currentColumn = 1;
}
+ break;
}
default: {
this.currentColumn ++;
Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:32:45 UTC (rev 7977)
+++ trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:44:10 UTC (rev 7978)
@@ -115,9 +115,7 @@
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
- <module name="FallThrough">
- <property name="severity" value="ignore"/>
- </module>
+ <module name="FallThrough"/>
<module name="FinalClass">
<property name="severity" value="ignore"/>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-07 23:53:29
|
Revision: 7979
http://svn.sourceforge.net/foray/?rev=7979&view=rev
Author: victormote
Date: 2006-09-07 16:53:02 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
trunk/foray/foray-common/src/java/org/foray/common/Environment.java
trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java
trunk/foray/foray-common/src/java/org/foray/common/ISO639.java
trunk/foray/foray-common/src/java/org/foray/common/Logging.java
trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java
trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java
trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java
trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java
trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java
trunk/foray/foray-common/src/java/org/foray/common/url/FOrayURLStreamHandlerFactory.java
trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java
trunk/foray/foray-common/src/java/org/foray/common/url/URLUtil.java
trunk/foray/foray-core/src/java/org/foray/core/Application.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -64,7 +64,7 @@
* FOray started up in a standard manner without diminishing the flexibility
* of its pluggable nature.
*/
-public class FOraySpecific {
+public final class FOraySpecific {
/**
* Private constructor, as this class should never be instantiated.
Modified: trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -48,7 +48,7 @@
* This class manages the process of parsing an input FO document and creating
* an FOTree.
*/
-public class OutputTargetFactory {
+public final class OutputTargetFactory {
/** Render to PDF. OutputStream must be set. */
public static final int RENDER_PDF = 1;
Modified: trunk/foray/foray-common/src/java/org/foray/common/Environment.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/Environment.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/Environment.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -38,7 +38,7 @@
* Class with some convenience methods for getting information about the
* environment.
*/
-public class Environment {
+public final class Environment {
/** Private constructor (should not be instantiated). */
private Environment() {
Modified: trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -38,7 +38,7 @@
* announces its first release.
* TODO: Replace with Jakarta Commons I/O.
*/
-public class IOUtil {
+public final class IOUtil {
/** Private constructor (should not be instantiated). */
private IOUtil() {
Modified: trunk/foray/foray-common/src/java/org/foray/common/ISO639.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ISO639.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/ISO639.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -34,7 +34,7 @@
* Utility class for validating ISO language codes using the ISO-639 standard.
*
*/
-public class ISO639 {
+public final class ISO639 {
/**
* This list is derived from
Modified: trunk/foray/foray-common/src/java/org/foray/common/Logging.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -38,7 +38,7 @@
* Along with the PseudoLogger interface in aXSL, this provides for both
* standardization and flexibility in logging.
*/
-public class Logging {
+public final class Logging {
/**
* Private constructor to prevent instantiation.
Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -32,7 +32,7 @@
* Utility class containing methods that are useful for manipulating or managing
* strings.
*/
-public class StringUtil {
+public final class StringUtil {
/**
* Private constructor (should never be instantiated).
Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -36,7 +36,7 @@
* Java 5.0 behavior on pre-Java 5.0 platforms. If you are coding against
* Java 5.0 or greater, the equivalent functions should be used instead.
*/
-public class StringUtilPre5 {
+public final class StringUtilPre5 {
/**
* Private constructor (should never be instantiated).
Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -33,7 +33,7 @@
* Appendix B of the XML 1.0 Standard defines several character classes. The
* methods in this class are used to map a given character to these classes.
*/
-public class XMLCharacter {
+public final class XMLCharacter {
/**
* As with all other character arrays in this class, elements are in pairs.
Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -36,7 +36,7 @@
/**
*
*/
-public class XMLParser {
+public final class XMLParser {
/**
* Private constructor (should not be instantiated).
@@ -44,7 +44,7 @@
private XMLParser() {
}
- public static final String getParserClassName() {
+ public static String getParserClassName() {
try {
return SAXParserFactory.newInstance().newSAXParser()
.getXMLReader().getClass().getName();
Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -31,7 +31,7 @@
/**
* Utility class containing methods useful in parsing or building XML.
*/
-public class XMLUtil {
+public final class XMLUtil {
/**
* This class should never be instantiated.
Modified: trunk/foray/foray-common/src/java/org/foray/common/url/FOrayURLStreamHandlerFactory.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/FOrayURLStreamHandlerFactory.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/FOrayURLStreamHandlerFactory.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -41,7 +41,8 @@
* URLStreamHandlerFactory implementation that allows custom protocols to be
* registered and accessed.
*/
-public class FOrayURLStreamHandlerFactory implements URLStreamHandlerFactory {
+public final class FOrayURLStreamHandlerFactory
+ implements URLStreamHandlerFactory {
/** The singleton instance of this class. */
private static FOrayURLStreamHandlerFactory urlSHFactory;
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-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -47,7 +47,7 @@
* custom {@link URLStreamHandler} implementations are discussed, and where
* one can be selected.
*/
-public class URLFactory {
+public final class URLFactory {
/**
* Private constructor. This should never be instantiated.
Modified: trunk/foray/foray-common/src/java/org/foray/common/url/URLUtil.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/URLUtil.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/URLUtil.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -39,7 +39,7 @@
/**
* This utility class contains various URL-related static utility methods.
*/
-public class URLUtil {
+public final class URLUtil {
/** Private constructor (should not be instantiated). */
private URLUtil() {
Modified: trunk/foray/foray-core/src/java/org/foray/core/Application.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/Application.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-core/src/java/org/foray/core/Application.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -31,7 +31,7 @@
/**
* class representing the FOray Application itself.
*/
-public class Application {
+public final class Application {
/** Private constructor (should not be instantiated). */
private Application() {
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-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -58,7 +58,7 @@
* This class is heavily based on the epxression parser in James Clark's
* XT, an XSLT processor.
*/
-public class PropertyParser extends PropertyTokenizer {
+public final class PropertyParser extends PropertyTokenizer {
private PropertyList propertyList;
private Stack stkFunction; // Stack of functions being evaluated
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -44,7 +44,7 @@
* {@link #makeDtColor(String)}, {@link #makeDtColor(Color)}, or
* {@link #makeDtColor(float, float, float, float)}.</p>
*/
-public class DtColor extends Datatype implements ExprColor {
+public final class DtColor extends Datatype implements ExprColor {
public static final Color COLOR_RGB_TRANSPARENT = new Color(255, 255, 255,
0);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -43,7 +43,7 @@
* line numbers. In that case, it is recommended that they simply use the
* odd value for each.
*/
-public class DtWritingMode extends Datatype implements
+public final class DtWritingMode extends Datatype implements
org.axsl.foR.WritingMode {
private static HashMap writingModes = new HashMap();
Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -33,7 +33,7 @@
/**
* Utility class for tokenizing a DTD.
*/
-public class DTDTokenizer {
+public final class DTDTokenizer {
/**
* Private constructor. Should not be instantiated.
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -34,7 +34,7 @@
/**
* Utility class for PostScript color conversions.
*/
-public class PSColor {
+public final class PSColor {
/**
* Private constructor. This currently has only static methods.
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -34,7 +34,7 @@
* size error.
* @see GlyphListAGL
*/
-public class GlyphListAGL2 {
+public final class GlyphListAGL2 {
/**
* This array contains the Unicode code points that correspond to the glyph
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -34,7 +34,7 @@
* size error.
* @see GlyphListAGL
*/
-public class GlyphListAGL3 {
+public final class GlyphListAGL3 {
public static final char[] CHAR_LIST = {
0x0001,
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 23:53:02 UTC (rev 7979)
@@ -34,7 +34,7 @@
* size error.
* @see GlyphListAGL
*/
-public class GlyphListAGL4 {
+public final class GlyphListAGL4 {
public static final short[] GLYPH_NAME_INDEX = {
1454,
Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:44:10 UTC (rev 7978)
+++ trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:53:02 UTC (rev 7979)
@@ -116,9 +116,7 @@
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="FallThrough"/>
- <module name="FinalClass">
- <property name="severity" value="ignore"/>
- </module>
+ <module name="FinalClass"/>
<module name="FinalParameters">
<!-- Not sure we want this one. We already have a test to make sure that
it is final if it can be, but this forces it to be final. -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-08 00:11:06
|
Revision: 7980
http://svn.sourceforge.net/foray/?rev=7980&view=rev
Author: victormote
Date: 2006-09-07 17:10:41 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-app/src/java/org/foray/app/FOray.java
trunk/foray/foray-common/src/java/org/foray/common/ClassService.java
trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.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/foray/ObjectMakerExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java
trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java
trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java
trunk/foray/scripts/checkstyle-config.xml
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-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -39,7 +39,17 @@
/**
* Command-line entry point to the FOray application.
*/
-public class FOray {
+public final class FOray {
+
+ /**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private FOray() { }
+
+ /**
+ * Main command-line entry point to FOray.
+ */
public static void main(final String[] args) {
CommandLineOptions options = null;
final Log logger = Logging.makeDefaultLogger();
Modified: trunk/foray/foray-common/src/java/org/foray/common/ClassService.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -43,10 +43,16 @@
* sun.misc.Service does, but that should not be relied on. Hopefully it will
* be part of standard jdk sometime.
*/
-public class ClassService {
+public final class ClassService {
static HashMap providerMap = new HashMap();
+ /**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private ClassService() { }
+
public static synchronized Enumeration providers(final Class cls) {
ClassLoader cl = cls.getClassLoader();
// null if loaded by bootstrap class loader
Modified: trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -59,7 +59,7 @@
* {@link ProtocolRegistrationStrategy} which may be a useful starting place for
* custom implementations.</p>
*/
-public class ProtocolRegistrationBroker {
+public final class ProtocolRegistrationBroker {
public static final byte UNIVERSAL_REGISTRATION_STRATEGY = 1;
public static final byte PROPERTY_REGISTRATION_STRATEGY = 2;
@@ -69,6 +69,12 @@
private static ProtocolRegistrationStrategy strategy = null;
/**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private ProtocolRegistrationBroker() { }
+
+ /**
* Factory method that knows how to create any of the standard URL Protocol
* Registration strategies.
* @param strategy One of {@link #UNIVERSAL_REGISTRATION_STRATEGY},
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-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -100,9 +100,15 @@
* Factory class for creating objects in the "fo:" (Formatting Objects)
* namespace.
*/
-public class ObjectMakerFO {
+public final class ObjectMakerFO {
/**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private ObjectMakerFO() { }
+
+ /**
* Converts an object name to its integral equivalent.
* @param objectName The object name to be enumerated.
* @return The enumerated value of the object name.
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-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -149,9 +149,15 @@
* Factory class for creating properties in the "fo:" (Formatting Objects)
* namespaces.
*/
-public class PropertyMakerFO {
+public final class PropertyMakerFO {
/**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private PropertyMakerFO() { }
+
+ /**
* Converts a property name to its integral equivalent.
* @param propertyName The property name to be enumerated.
* @return The enumerated value of the property name.
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -39,7 +39,7 @@
/**
* Factory class for creating formatting objects in the "foray" namespace.
*/
-public class ObjectMakerExtensions {
+public final class ObjectMakerExtensions {
public static final byte CONTINUED_LABEL = 1;
@@ -53,6 +53,12 @@
};
/**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private ObjectMakerExtensions() { }
+
+ /**
* Converts an object name to its integral equivalent.
* @param objectName The object name to be enumerated.
* @return The enumerated value of the object name.
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -40,7 +40,7 @@
/**
* Factory class for creating formatting objects in the "svg" namespace.
*/
-public class ObjectMakerSVG {
+public final class ObjectMakerSVG {
public static final byte A = 1;
public static final byte ALTGLYPH = 2;
@@ -152,6 +152,12 @@
};
/**
+ * Private constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private ObjectMakerSVG() { }
+
+ /**
* Converts an object name to its integral equivalent.
* @param objectName The object name to be enumerated.
* @return The enumerated value of the object name.
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -38,7 +38,7 @@
/**
* Class for parsing attributes in the xml: namespace.
*/
-public class PropertyMakerXML {
+public final class PropertyMakerXML {
public static final short OFFSET_FROM_PROPERTY_NAME_LIST = 500;
public static final short LANG = 501;
@@ -53,6 +53,12 @@
};
/**
+ * Private constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private PropertyMakerXML() { }
+
+ /**
* Converts a property name to its integral equivalent.
* @param propertyName The property name to be enumerated.
* @return The enumerated value of the property name.
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -33,7 +33,7 @@
/**
* Utility class representating the Pioneer Layout status of an FO.
*/
-public abstract class Status {
+public final class Status {
public static final int UNKNOWN = -1;
public static final int OK = 1;
@@ -45,6 +45,12 @@
public static final int FORCE_COLUMN_BREAK = 7;
public static final int KEEP_WITH_NEXT = 8;
+ /**
+ * Private Constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private Status() { }
+
public static boolean isIncomplete(final int code) {
return ((code != OK) && (code != KEEP_WITH_NEXT));
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -32,8 +32,14 @@
/**
* @author Jeremias Maerki
*/
-public class Main {
+public final class Main {
+ /**
+ * Private constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private Main() { }
+
public static void main(final String[] args) {
try {
if (args == null
Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java 2006-09-08 00:10:41 UTC (rev 7980)
@@ -44,11 +44,17 @@
/**
* Some utilities for creating svg DOM documents and elements.
*/
-public class SVGUtilities {
+public final class SVGUtilities {
+
static final String SVG_NS = SVGDOMImplementation.SVG_NAMESPACE_URI;
+ /**
+ * Private constructor. This is a utility class and should never be
+ * instantiated.
+ */
+ private SVGUtilities() { }
- public static final Document createSVGDocument(final float width,
+ public static Document createSVGDocument(final float width,
final float height) {
final DOMImplementation impl =
SVGDOMImplementation.getDOMImplementation();
@@ -64,7 +70,7 @@
/**
* Get the string width for a particular string given the font.
*/
- public static final float getStringWidth(final String str,
+ public static float getStringWidth(final String str,
final Font font) {
final Rectangle2D rect =
font.getStringBounds(str, 0, str.length(),
@@ -76,7 +82,7 @@
/**
* Get the string height for a particular string given the font.
*/
- public static final float getStringHeight(final String str,
+ public static float getStringHeight(final String str,
final Font font) {
final Rectangle2D rect =
font.getStringBounds(str, 0, str.length(),
@@ -88,7 +94,7 @@
/**
* Get the string bounds for a particular string given the font.
*/
- public static final Rectangle2D getStringBounds(final String str,
+ public static Rectangle2D getStringBounds(final String str,
final Font font) {
return font.getStringBounds(str, 0, str.length(),
new FontRenderContext(new AffineTransform(), true, true));
@@ -97,7 +103,7 @@
/**
* Create an SVG Line
*/
- public static final Element createLine(final Document doc, final float x,
+ public static Element createLine(final Document doc, final float x,
final float y, final float x2, final float y2) {
final Element ellipse = doc.createElementNS(SVGUtilities.SVG_NS,
"line");
@@ -111,7 +117,7 @@
/**
* Create an SVG Ellipse
*/
- public static final Element createEllipse(final Document doc,
+ public static Element createEllipse(final Document doc,
final float cx, final float cy, final float rx, final float ry) {
final Element ellipse = doc.createElementNS(SVGUtilities.SVG_NS,
"ellipse");
@@ -125,7 +131,7 @@
/**
* Create an SVG Path.
*/
- public static final Element createPath(final Document doc,
+ public static Element createPath(final Document doc,
final String str) {
final Element path = doc.createElementNS(SVGUtilities.SVG_NS, "path");
path.setAttributeNS(null, "d", str);
@@ -135,7 +141,7 @@
/**
* Create an SVG Text object.
*/
- public static final Element createText(final Document doc, final float x,
+ public static Element createText(final Document doc, final float x,
final float y, final String str) {
final Element textGraph = doc.createElementNS(SVGUtilities.SVG_NS,
"text");
@@ -149,7 +155,7 @@
/**
* Create an SVG Rectangle.
*/
- public static final Element createRect(final Document doc, final float x,
+ public static Element createRect(final Document doc, final float x,
final float y, final float width, final float height) {
final Element border = doc.createElementNS(SVGUtilities.SVG_NS, "rect");
border.setAttributeNS(null, "x", "" + x);
@@ -162,7 +168,7 @@
/**
* Create an SVG G.
*/
- public static final Element createG(final Document doc) {
+ public static Element createG(final Document doc) {
final Element border = doc.createElementNS(SVGUtilities.SVG_NS, "g");
return border;
}
@@ -170,7 +176,7 @@
/**
* Create an SVG Clip.
*/
- public static final Element createClip(final Document doc,
+ public static Element createClip(final Document doc,
final Element els, final String id) {
final Element border = doc.createElementNS(SVGUtilities.SVG_NS,
"clipPath");
@@ -179,7 +185,7 @@
return border;
}
- public static final Element createImage(final Document doc,
+ public static Element createImage(final Document doc,
final String ref, final float width, final float height) {
final Element border = doc.createElementNS(SVGUtilities.SVG_NS,
"image");
@@ -193,7 +199,7 @@
/**
* Create some SVG text that is wrapped into a specified width..
*/
- public static final Element wrapText(final Document doc, final String str,
+ public static Element wrapText(final Document doc, final String str,
final Font font, final float width) {
final Element g = createG(doc);
Element text;
Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml 2006-09-07 23:53:02 UTC (rev 7979)
+++ trunk/foray/scripts/checkstyle-config.xml 2006-09-08 00:10:41 UTC (rev 7980)
@@ -117,24 +117,23 @@
<module name="EmptyStatement"/>
<module name="FallThrough"/>
<module name="FinalClass"/>
- <module name="FinalParameters">
- <!-- Not sure we want this one. We already have a test to make sure that
- it is final if it can be, but this forces it to be final. -->
- <property name="severity" value="ignore"/>
- </module>
+
+ <!-- Leave this one off. We already have a test to make sure that it is
+ final if it can be, but this forces it to be final. -->
+ <!--<module name="FinalParameters"/>-->
+
<!-- Skip for now. The Ant build chokes on this. -->
<!--<module name="j2ee.FinalStatic"/>-->
+
<module name="RegexpHeader">
<property name="headerFile" value="${foray.home}/scripts/checkstyle-header-java.txt"/>
</module>
- <module name="HiddenField">
- <!-- This one should stay off. We use "RequireThis" to distinguish local
- variables and parameters from instance variables. -->
- <property name="severity" value="ignore"/>
- </module>
- <module name="HideUtilityClassConstructor">
- <property name="severity" value="ignore"/>
- </module>
+
+ <!-- Leave this one off. We use "RequireThis" to distinguish local variables
+ and parameters from instance variables. -->
+ <!--<module name="HiddenField"/>-->
+
+ <module name="HideUtilityClassConstructor"/>
<module name="IllegalCatch">
<property name="severity" value="ignore"/>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-08 00:23:31
|
Revision: 7982
http://svn.sourceforge.net/foray/?rev=7982&view=rev
Author: victormote
Date: 2006-09-07 17:23:21 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-09-08 00:18:28 UTC (rev 7981)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-09-08 00:23:21 UTC (rev 7982)
@@ -467,8 +467,7 @@
if (fontStream != null) {
try {
fontStream.close();
- } catch (final Exception ex)
- {
+ } catch (final Exception ex) {
}
}
}
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java 2006-09-08 00:18:28 UTC (rev 7981)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java 2006-09-08 00:23:21 UTC (rev 7982)
@@ -360,8 +360,9 @@
+ EOL);
}
- } else // if (this.patternType ==2)
- { // Smooth Shading...
+ } else {
+ // if (this.patternType ==2)
+ // Smooth Shading...
if (this.shading != null) {
p.append("/Shading " + this.shading.pdfReference() + EOL);
}
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 00:18:28 UTC (rev 7981)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-09-08 00:23:21 UTC (rev 7982)
@@ -181,8 +181,8 @@
int x = x1;
int y = y1;
int height, width;
- if (x1 == x2) // vertical line
- {
+ if (x1 == x2) {
+ /* vertical line */
height = y2 - y1;
if (height > 0) // y coordinates are reversed between fo and AWT
{
@@ -194,8 +194,8 @@
width = -width;
x -= width;
}
- } else // horizontal line
- {
+ } else {
+ /* horizontal line */
width = x2 - x1;
if (width < 0) {
width = -width;
Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml 2006-09-08 00:18:28 UTC (rev 7981)
+++ trunk/foray/scripts/checkstyle-config.xml 2006-09-08 00:23:21 UTC (rev 7982)
@@ -139,13 +139,11 @@
</module>
<module name="IllegalThrows"/>
<module name="Indentation">
- <!-- Doesn't differentiate between inter- and intra-statement
- indentation. -->
+ <!-- Leave off for now. We need something that differentiates between
+ inter- and intra-statement indentation. -->
<property name="severity" value="ignore"/>
</module>
- <module name="LeftCurly">
- <property name="severity" value="ignore"/>
- </module>
+ <module name="LeftCurly"/>
<module name="MethodParamPad">
<property name="severity" value="ignore"/>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2006-09-08 01:12:14
|
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.
|
|
From: <vic...@us...> - 2006-09-08 01:31:37
|
Revision: 7986
http://svn.sourceforge.net/foray/?rev=7986&view=rev
Author: victormote
Date: 2006-09-07 18:30:56 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java
trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationStrategy.java
trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceTemplate.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/SubSequenceSpecifier.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXObject.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSFile.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSInput.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSNumber.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java
trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -288,7 +288,7 @@
* @return The total amount of the progression-dimension that has been
* used by siblings.
*/
- public abstract int pdUsedBySiblings() ;
+ public abstract int pdUsedBySiblings();
/**
* @return The inline-progression-dimension of the border-rectangle for
@@ -504,7 +504,7 @@
* @return The block-progression-dimension of the content-rectangle for
* this Area.
*/
- public abstract int crBPD() ;
+ public abstract int crBPD();
/**
* The difference, in millipoints, between the page-viewport-area's
Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -70,7 +70,7 @@
* Return the input as an InputStream.
* @return An InputStream containing the input contents.
*/
- InputStream getInputStream() throws IOException ;
+ InputStream getInputStream() throws IOException;
/**
* Releases any resources that can be released without compromising the
@@ -81,6 +81,6 @@
* Note that if resources are reset, each implementation is responsible to
* reboot those resources when needed.
*/
- void reset() ;
+ void reset();
}
Modified: trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationStrategy.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationStrategy.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationStrategy.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -51,6 +51,6 @@
* @return The URLStreamHandler registered with this registration scheme,
* or null if the protocol has not been registered.
*/
- URLStreamHandler getURLStreamHandler(String protocol) ;
+ URLStreamHandler getURLStreamHandler(String protocol);
}
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:14:35 UTC (rev 7985)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -161,8 +161,8 @@
*/
aRef=true;
}
- for (i = start ; !aRef && (i < limit) &&
- ((c = spec.charAt(i)) != '/') ; i++) {
+ for (i = start; !aRef && (i < limit) &&
+ ((c = spec.charAt(i)) != '/'); i++) {
if (c == ':') {
final String s = spec.substring(start, i).toLowerCase();
if (isValidProtocol(s)) {
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -82,7 +82,7 @@
/**
* {@inheritDoc}
*/
- public abstract int width(int c, int fontSize) ;
+ public abstract int width(int c, int fontSize);
/**
* {@inheritDoc}
@@ -170,27 +170,27 @@
/**
* {@inheritDoc}
*/
- public abstract boolean isEmbeddable() ;
+ public abstract boolean isEmbeddable();
/**
* {@inheritDoc}
*/
- public abstract boolean isSubsettable() ;
+ public abstract boolean isSubsettable();
/**
* {@inheritDoc}
*/
- public abstract java.awt.Font getAWTFont(int fontSize) ;
+ public abstract java.awt.Font getAWTFont(int fontSize);
/**
* {@inheritDoc}
*/
- public abstract boolean usableInPostScriptOutput() ;
+ public abstract boolean usableInPostScriptOutput();
/**
* {@inheritDoc}
*/
- public abstract org.axsl.psR.Encoding getInternalEncoding() ;
+ public abstract org.axsl.psR.Encoding getInternalEncoding();
/**
* {@inheritDoc}
@@ -202,9 +202,9 @@
/**
* {@inheritDoc}
*/
- public abstract byte getFontFormat() ;
+ public abstract byte getFontFormat();
- protected abstract Kerning getKerning() ;
+ protected abstract Kerning getKerning();
/**
* Reports whether the font actually contains any kerning information.
@@ -225,12 +225,12 @@
* @return True if both 1) kerning is available for this font, and 2) the
* font configuration has kerning="yes" for this font; false otherwise.
*/
- public abstract boolean kerningActive() ;
+ public abstract boolean kerningActive();
/**
* {@inheritDoc}
*/
- public abstract int kern(int char1, int char2) ;
+ public abstract int kern(int char1, int char2);
/**
* Returns the width of the undefined or missing glyph.
@@ -238,34 +238,34 @@
* @return The width, in millipoints, of the undefined glyph at the
* specified point size.
*/
- public abstract int widthUndefinedGlyph(int fontSize) ;
+ public abstract int widthUndefinedGlyph(int fontSize);
/**
* Reports on the availability of a glyph in this font, without regard to
* encoding issues.
* @return True iff this font can paint a glyph for <em>c</em>.
*/
- public abstract boolean glyphAvailable(int c) ;
+ public abstract boolean glyphAvailable(int c);
/**
* {@inheritDoc}
*/
- public abstract float getItalicAngle() ;
+ public abstract float getItalicAngle();
/**
* {@inheritDoc}
*/
- public abstract int getStemV() ;
+ public abstract int getStemV();
/**
* {@inheritDoc}
*/
- public abstract int getDefaultWidth() ;
+ public abstract int getDefaultWidth();
/**
* {@inheritDoc}
*/
- public abstract boolean isPDFStandardFont() ;
+ public abstract boolean isPDFStandardFont();
public RegisteredFont getRegisteredFont() {
return this.registeredFont;
@@ -278,12 +278,12 @@
/**
* @return The number of glyphs in this font.
*/
- public abstract int getNumGlyphs() ;
+ public abstract int getNumGlyphs();
/**
* @return The character set for this font.
*/
- public abstract CharSet getCharSet() ;
+ public abstract CharSet getCharSet();
/**
* {@inheritDoc}
@@ -320,7 +320,7 @@
* {@link Integer#MIN_VALUE}.
*/
public abstract int extractBaseline(int writingMode, int baselineType,
- int fontSize) ;
+ int fontSize);
/**
* Provides reasonable estimates of the various baseline values for the
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -45,6 +45,6 @@
public abstract RegisteredFontDesc selectFont(String [] familyList,
int style, int weight, int variant, int stretch, int size,
- int codePoint) throws FontException ;
+ int codePoint) throws FontException;
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -166,7 +166,7 @@
return fontSize * xHeight / 1000;
}
- public abstract int[] getFontBBox() ;
+ public abstract int[] getFontBBox();
public int getFlags() {
return flags;
@@ -184,7 +184,7 @@
* defined in the PDF Reference, Second Edition, Section 5.7.
* @return The StemV value, in 1/1000ths of a text space unit.
*/
- public abstract int getStemV() ;
+ public abstract int getStemV();
/**
* @return The default glyph width for this font, expressed in 1/1000ths of
@@ -257,7 +257,7 @@
}
public abstract byte[] getRawFontFile(FOrayFontUse fontUse)
- throws IOException ;
+ throws IOException;
/**
* FreeStandingFonts are never AWTFonts, so this always returns null.
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -97,7 +97,7 @@
/**
* Parses the Metrics file
*/
- public abstract void load() throws IOException ;
+ public abstract void load() throws IOException;
/**
* Returns the name of the font.
@@ -135,7 +135,7 @@
* Returns the name of the font's encoding vector, e.g. "StandardEncoding".
* @return The name of the font's encoding vector.
*/
- public abstract String getEncoding() ;
+ public abstract String getEncoding();
/**
* Returns the CapHeight parameter for the font (height of uppercase H).
@@ -171,14 +171,14 @@
* number.
* @return The LowerCaseDescent parameter.
*/
- public abstract int getLowerCaseDescent() ;
+ public abstract int getLowerCaseDescent();
/**
* Tells whether the font has proportional character spacing.
*
* @return ex. true for Times, false for Courier.
*/
- public abstract boolean getIsProportional() ;
+ public abstract boolean getIsProportional();
/**
* Returns the bounding box for the font.
@@ -247,13 +247,13 @@
* Returns the width of the dominant vertical stems of the font.
* @return The vertical stem width.
*/
- public abstract int getStemV() ;
+ public abstract int getStemV();
/**
* Returns the width of the dominant horizontal stems of the font.
* @return The horizontal stem width.
*/
- public abstract int getStemH() ;
+ public abstract int getStemH();
/**
* Returns the italic angle of the font.
@@ -273,10 +273,10 @@
return this.extentTable;
}
- public abstract CharSet getCharSet() ;
+ public abstract CharSet getCharSet();
- public abstract EncodingVector getInternalEncoding() ;
+ public abstract EncodingVector getInternalEncoding();
- public abstract String getUniqueID() ;
+ public abstract String getUniqueID();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -85,7 +85,7 @@
/**
* Parse the basics of the font file.
*/
- protected abstract void readFile() throws IOException ;
+ protected abstract void readFile() throws IOException;
/**
* Returns the TTFFont instance, if any, for a given font name.
@@ -94,13 +94,13 @@
* correct font in a TrueType collection).
* @return The TTFFont instance for fontName.
*/
- public abstract TTFFont getTTFFont(String fontName) throws IOException ;
+ public abstract TTFFont getTTFFont(String fontName) throws IOException;
/**
* Return an array of all TTFFont instances in this file.
* @return An array of all TTFFont instances in this file.
*/
- public abstract TTFFont[] getTTFFonts() ;
+ public abstract TTFFont[] getTTFFonts();
public Log getLogger() {
return reader.getLogger();
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -69,7 +69,7 @@
abstract void parseTable() throws IOException;
- abstract String getTableTag() ;
+ abstract String getTableTag();
/**
* Position inputstream to position indicated
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-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -152,7 +152,7 @@
* properties are parsed.
* @throws FOTreeException For invalid ancestry.
*/
- protected abstract void validateAncestry() throws FOTreeException ;
+ protected abstract void validateAncestry() throws FOTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
@@ -161,14 +161,14 @@
* any children have been read.
* @throws FOTreeException For invalid properties.
*/
- protected abstract void validateProperties() throws FOTreeException ;
+ protected abstract void validateProperties() throws FOTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
* do some initialization-type work after all of the properties have been
* parsed, but before any of the children have been parsed.
*/
- protected abstract void setup() throws FOTreeException ;
+ protected abstract void setup() throws FOTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
@@ -176,14 +176,14 @@
* This method is called after all children have been parsed.
* @throws FOTreeException For invalid descendants.
*/
- protected abstract void validateDescendants() throws FOTreeException ;
+ protected abstract void validateDescendants() throws FOTreeException;
/**
* This method is a hook into the parsing process, primarily to allow the
* subclass to do some validation or setup work after the object and all of
* its properties have been parsed and all of its children processed.
*/
- protected abstract void end() throws FOTreeException ;
+ protected abstract void end() throws FOTreeException;
/**
* Subclasses can set this flag to false if there is a validity problem
@@ -392,7 +392,7 @@
* Gets the Namespace instance that is associated with this object.
* @return The Namespace instance that is associated with this object.
*/
- public abstract Namespace getNamespace() ;
+ public abstract Namespace getNamespace();
public String getPropertyName(final short propertyType) {
return getFOTreeBuilder().getPropertyName(propertyType);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -84,7 +84,7 @@
* @return True iff PCDATA in this element must have an ancestor block
* element.
*/
- public abstract boolean blockMustEnclosePCDATA() ;
+ public abstract boolean blockMustEnclosePCDATA();
protected void end() throws FOTreeException {
finalizeText();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -194,8 +194,8 @@
this.stringBuffer.append(data, start, length);
}
- public abstract int intrinsicContentWidth() ;
+ public abstract int intrinsicContentWidth();
- public abstract int intrinsicContentHeight() ;
+ public abstract int intrinsicContentHeight();
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -231,7 +231,7 @@
* @param localName The local name of the element to be enumerated.
* @return The byte representation of the element name.
*/
- public abstract byte enumerateElement(String localName) ;
+ public abstract byte enumerateElement(String localName);
/**
* Converts the String attributeName to a byte representation of the
@@ -239,10 +239,10 @@
* @param attributeName The local name of the attribute to be enumerated.
* @return The short representation of the attribute name.
*/
- public abstract short enumerateAttribute(String attributeName) ;
+ public abstract short enumerateAttribute(String attributeName);
protected abstract PropertyList createNewPropertyList(String localName,
- Attributes attlist) ;
+ Attributes attlist);
/**
* Returns the name of the property from its integral representation. Used
@@ -251,6 +251,6 @@
* this Namespace.
* @return The String representation of the property name.
*/
- public abstract String getPropertyName(short propertyType) ;
+ public abstract String getPropertyName(short propertyType);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -184,7 +184,7 @@
return pv;
}
- protected abstract short[] getValidKeywords() ;
+ protected abstract short[] getValidKeywords();
protected PropertyKeyword checkKeywords(final String possibleKeyword) {
final short[] validKeywords = getValidKeywords();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -154,7 +154,7 @@
*/
private abstract class SubSequenceWrapper {
abstract String getNextPageMasterName(boolean isFirstPage,
- boolean isLastPage, boolean isOddPage, boolean isEmptyPage) ;
+ boolean isLastPage, boolean isOddPage, boolean isEmptyPage);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceTemplate.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceTemplate.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceTemplate.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -43,6 +43,6 @@
* @return The page-master instances that can be generated from this
* template.
*/
- Set getPages() ;
+ Set getPages();
}
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-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -159,28 +159,28 @@
* @return The X coordinate of the upper left corner of the region's
* viewport's content rectangle, in millipoints.
*/
- public abstract int getXPositionVPContent(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 getYPositionVPContent(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 getWidthVPContent(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 getHeightVPContent(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/SubSequenceSpecifier.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -94,7 +94,7 @@
* @return The page-master instances that can be generated from this
* specifier.
*/
- public abstract Set getPages() ;
+ public abstract Set getPages();
/**
* Checks to make sure that each page referenced actually exists.
@@ -102,6 +102,6 @@
* layout-master-set has been parsed, as you cannot be sure that all
* page-masters have been parsed until then.
*/
- public abstract void validatePageExistence() throws FOTreeException ;
+ public abstract void validatePageExistence() throws FOTreeException;
}
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-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -117,7 +117,7 @@
// Evaluate and put result on the operand stack
ExprAdditive prop = parseMultiplicativeExpr();
loop:
- for (; ; ) {
+ for (;;) {
switch (currentToken) {
case TOK_PLUS:
next();
@@ -143,7 +143,7 @@
throws PropertyException {
ExprMultiplicative prop = parseUnaryExpr();
loop:
- for (; ; ) {
+ for (;;) {
switch (currentToken) {
case TOK_DIV:
next();
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-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -113,7 +113,7 @@
currentTokenValue = null;
currentTokenStartIndex = exprIndex;
boolean bSawDecimal;
- for (; ; ) {
+ for (;;) {
if (exprIndex >= exprLength) {
currentToken = TOK_EOF;
return;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -54,7 +54,7 @@
* {@link #UNIT_POWER_AREA}.
* @return The unit power to which this expression evaluates.
*/
- public abstract byte unitPower() ;
+ public abstract byte unitPower();
/**
* Indicates whether this expression can be evaluated to a unit power = 1
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -224,9 +224,9 @@
*/
protected abstract void loadImage() throws GraphicException;
- public abstract int getGraphicType() ;
+ public abstract int getGraphicType();
- public abstract int getCompressionType() throws GraphicException ;
+ public abstract int getCompressionType() throws GraphicException;
public Log getLogger() {
return server.getLogger();
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:14:35 UTC (rev 7985)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -495,7 +495,7 @@
int minCharCount = 2;
final BufferedReader in =
new BufferedReader(new InputStreamReader(System.in));
- for (; ; ) {
+ for (;;) {
logger.info("l:\tload patterns from XML\n"
+ "L:\tload patterns from serialized object\n"
+ "s:\tset minimun character count\n"
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java 2006-09-08 01:14:35 UTC (rev 7985)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java 2006-09-08 01:30:56 UTC (rev 7986)
@@ -615,7 +615,7 @@
}
boolean leaf = false;
- for (; ; ) {
+ for (;;) {
// first go down on low branch until leaf or compressed branch
while (cur != 0) {
...
[truncated message content] |
|
From: <vic...@us...> - 2006-09-08 01:03:08
|
Revision: 7983
http://svn.sourceforge.net/foray/?rev=7983&view=rev
Author: victormote
Date: 2006-09-07 18:01:57 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java
trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java
trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java
trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java
trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java
trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePCLT.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java
trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.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/RelativeDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.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/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFShading.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSInputFile.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingParser.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListParser.java
trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
trunk/foray/scripts/checkstyle-config.xml
Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -78,7 +78,7 @@
* Sets the user configuration file.
* @param userConfig File containing the user configuration.
*/
- public void setUserconfig (final URL userConfig) {
+ public void setUserconfig(final URL userConfig) {
this.userConfig = userConfig;
}
Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -101,7 +101,7 @@
this.sessionConfig = new SessionConfig(getLogger());
this.outputConfig = new OutputConfig(getLogger());
if (task.userConfig != null) {
- new Options (this.getLogger(), sessionConfig, outputConfig,
+ new Options(this.getLogger(), sessionConfig, outputConfig,
task.userConfig);
}
Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -66,8 +66,8 @@
// Setup FOrayDocument
// Setup JAXP transformation
final TransformerFactory factory = TransformerFactory.newInstance();
- final Transformer transformer = factory.newTransformer
- (new StreamSource(xslt));
+ final Transformer transformer = factory.newTransformer(
+ new StreamSource(xslt));
// Setup JAXP input source
final Source source = team.getSourceForProjectTeam();
/*
Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -66,8 +66,8 @@
// Setup FOrayDocument
// Setup JAXP transformation
final TransformerFactory factory = TransformerFactory.newInstance();
- final Transformer transformer = factory.newTransformer
- (new StreamSource(xslt));
+ final Transformer transformer = factory.newTransformer(
+ new StreamSource(xslt));
// Setup JAXP input source
final Source source = new StreamSource(xml);
/*
Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -89,7 +89,7 @@
final File xslFile = new File(xslParam);
renderXML(xmlFile, xslFile, response);
} else {
- response.setContentType ("text/html");
+ response.setContentType("text/html");
final PrintWriter out = response.getWriter();
out.println("<html><head><title>Error</title></head>\n"
+ "<body><h1>FOray DemoServlet Error</h1><h3>No 'fo' "
@@ -145,8 +145,8 @@
TransformerConfigurationException, FOrayException {
// Setup FOrayDocument
final TransformerFactory factory = TransformerFactory.newInstance();
- final Transformer transformer = factory.newTransformer
- (new StreamSource(xslFile));
+ final Transformer transformer = factory.newTransformer(
+ new StreamSource(xslFile));
final Source source = new StreamSource(xmlFile);
final FOrayDocument document = new FOrayDocument(session, transformer,
source);
@@ -199,8 +199,8 @@
// Setup FOrayDocument
final TransformerFactory factory = TransformerFactory.newInstance();
- final Transformer transformer = factory.newTransformer
- (new StreamSource(xslFile));
+ final Transformer transformer = factory.newTransformer(
+ new StreamSource(xslFile));
final Source source = new StreamSource(xmlFile);
final FOrayDocument document = new FOrayDocument(session,
transformer, source);
Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -92,7 +92,7 @@
inputSource);
setupTarget(document);
session.process();
- reportOK (response);
+ reportOK(response);
} catch (final Exception ex) {
throw new ServletException(ex);
}
@@ -110,7 +110,7 @@
session);
setupTarget(document);
session.process();
- reportOK (response);
+ reportOK(response);
} catch (final Exception ex) {
throw new ServletException(ex);
}
@@ -130,16 +130,16 @@
}
// private helper, tell (browser) user that file printed
- private void reportOK (final HttpServletResponse response)
+ private void reportOK(final HttpServletResponse response)
throws ServletException {
final String sMsg = "<html><title>Success</title>\n"
+ "<body><h1>FOray DemoPrintServlet: </h1>"
+ "<h3>The requested data was printed</h3></body></html>";
- response.setContentType ("text/html");
- response.setContentLength (sMsg.length());
+ response.setContentType("text/html");
+ response.setContentLength(sMsg.length());
try {
final PrintWriter out = response.getWriter();
- out.println (sMsg);
+ out.println(sMsg);
out.flush();
} catch (final Exception ex) {
throw new ServletException(ex);
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-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -204,7 +204,7 @@
/**
* {@inheritDoc}
*/
- public void registerListener (final AreaTreeListener listener) {
+ public void registerListener(final AreaTreeListener listener) {
if (listener == null) {
return;
}
@@ -216,7 +216,7 @@
* {@link AreaTreeEvent} firings.
* @param listener The listener to be unregistered.
*/
- public void unRegisterListener (final AreaTreeListener listener) {
+ public void unRegisterListener(final AreaTreeListener listener) {
if (listener == null) {
return;
}
Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -549,7 +549,7 @@
/**
* Constructor
*/
- ByteSearcher (final byte[] bytesToFind, final long startRange,
+ ByteSearcher(final byte[] bytesToFind, final long startRange,
final long endRange, final boolean readBackward) {
this.bytesToFind = bytesToFind;
this.startRange = startRange;
Modified: trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/ProtocolRegistrationBroker.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -119,7 +119,7 @@
* {@link #getRegistrationStrategy} method.
* @param strategy the registry used to record custom URL protocol handlers
*/
- public static synchronized void setRegistrationStrategy (
+ public static synchronized void setRegistrationStrategy(
final ProtocolRegistrationStrategy strategy) {
checkAlreadySet();
ProtocolRegistrationBroker.strategy = strategy;
Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -142,7 +142,7 @@
* @param session The parent FOraySession.
* @param domDocument A DOM Document.
*/
- public FOrayDocument (final FOraySession session,
+ public FOrayDocument(final FOraySession session,
final Document domDocument) throws FOrayException {
this(session);
this.inputSource = new DocumentInputSource(domDocument);
@@ -155,7 +155,7 @@
* @param session The parent FOraySession.
* @param jaxpTransformer A JAXP Transformer.
*/
- public FOrayDocument (final FOraySession session,
+ public FOrayDocument(final FOraySession session,
final Transformer jaxpTransformer, final Source jaxpSource)
throws FOrayException {
this(session);
@@ -169,7 +169,7 @@
* xslt input.
* @param session The parent FOraySession.
*/
- public FOrayDocument (final FOraySession session, final URL xmlInput,
+ public FOrayDocument(final FOraySession session, final URL xmlInput,
final URL xsltInput) throws FOrayException {
this(session);
InputStream xmlInputStream = null;
Modified: trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -88,13 +88,13 @@
|| key.equals("hyphenation-base-directory")) {
// URL for a directory.
final URL baseDir = parseURLDirectory(key, value);
- put (key, baseDir, precedenceValue);
+ put(key, baseDir, precedenceValue);
return true;
}
if (key.equals("font-configuration")) {
// URL for a file.
final URL baseDir = parseURLFile(key, value);
- put (key, baseDir, precedenceValue);
+ put(key, baseDir, precedenceValue);
return true;
}
if (key.equals("verbosity")) {
@@ -102,7 +102,7 @@
if (value.equals("quiet")
|| value.equals("normal")
|| value.equals("debug")) {
- put (key, value, precedenceValue);
+ put(key, value, precedenceValue);
return true;
}
}
@@ -120,7 +120,7 @@
// Validated String.
if (value.equals("render")
|| value.equals("validate")) {
- put (key, value, precedenceValue);
+ put(key, value, precedenceValue);
return true;
}
}
@@ -133,7 +133,7 @@
}
public void setBaseDirectory(final URL newBaseDir, final int precedence) {
- put ("base-directory", newBaseDir, precedence);
+ put("base-directory", newBaseDir, precedence);
}
public boolean optionCacheGraphics() {
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -427,7 +427,7 @@
} catch (final InternalError e) {
return null;
}
- this.graphic.setRenderingHint (RenderingHints.KEY_FRACTIONALMETRICS,
+ this.graphic.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
RenderingHints.VALUE_FRACTIONALMETRICS_ON);
}
return graphic;
Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -136,7 +136,7 @@
final char [] ac = new char [1];
ac [0] = (char) c;
- double dWidth = fm.getStringBounds (ac, 0, 1, getGraphics()).getWidth()
+ double dWidth = fm.getStringBounds(ac, 0, 1, getGraphics()).getWidth()
* SystemFont.MILLIPOINT_CONVERSION_FACTOR;
// The following was left in based on this comment from the past (may be
Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -64,7 +64,7 @@
/**
* Create a new CharSetParser instance.
*/
- public CharSetParser (final Log logger, final RandomReader reader) {
+ public CharSetParser(final Log logger, final RandomReader reader) {
this.logger = logger;
this.reader = reader;
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -85,7 +85,7 @@
* @param reader The MetricsFileReader instance that encapsulates the
* actual metrics file.
*/
- public MetricsFile (final MetricsFileReader reader) {
+ public MetricsFile(final MetricsFileReader reader) {
this.reader = reader;
try {
load();
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -41,7 +41,7 @@
protected char dfFirstChar = 0;
protected char dfLastChar = 0;
- public MetricsFilePFM (final MetricsFileReader reader) {
+ public MetricsFilePFM(final MetricsFileReader reader) {
super(reader);
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -816,7 +816,7 @@
return byteArray;
}
- private int getPadSize (final int rawSize) {
+ private int getPadSize(final int rawSize) {
int padSize = 4 - (rawSize % 4);
if (padSize == 4) {
padSize = 0;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -35,7 +35,7 @@
*/
class TTFTableCFF extends TTFTable {
- TTFTableCFF (final TTFFont ttfFile) throws IOException {
+ TTFTableCFF(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -45,7 +45,7 @@
private CMap unicodeCMap;
- TTFTableCMAP (final TTFFont ttfFile) throws IOException {
+ TTFTableCMAP(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -47,7 +47,7 @@
* Constructor suitable for parsing an existing Table Directory.
* @throws IOException
*/
- TTFTableDirectory (final TTFFile ttfFile, final long fileOffset)
+ TTFTableDirectory(final TTFFile ttfFile, final long fileOffset)
throws IOException {
this.ttfFile = ttfFile;
this.fileOffset = fileOffset;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -35,7 +35,7 @@
*/
class TTFTableGLYF extends TTFTable {
- TTFTableGLYF (final TTFFont ttfFile) throws IOException {
+ TTFTableGLYF(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -41,7 +41,7 @@
int fontBBox4 = 0;
int indexToLocFormat;
- TTFTableHEAD (final TTFFont ttfFile) throws IOException {
+ TTFTableHEAD(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -46,7 +46,7 @@
*/
int numberOfHMetrics;
- TTFTableHHEA (final TTFFont ttfFile) throws IOException {
+ TTFTableHHEA(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -36,7 +36,7 @@
class TTFTableHMTX extends TTFTable {
TTFMtxEntry[] metrics;
- TTFTableHMTX (final TTFFont ttfFile) throws IOException {
+ TTFTableHMTX(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -36,7 +36,7 @@
class TTFTableKERN extends TTFTable {
Kerning kerningTab;
- TTFTableKERN (final TTFFont ttfFile) throws IOException {
+ TTFTableKERN(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -36,7 +36,7 @@
class TTFTableLOCA extends TTFTable {
long lastLoca = 0; // offset to last loca
- TTFTableLOCA (final TTFFont ttfFile) throws IOException {
+ TTFTableLOCA(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -37,7 +37,7 @@
/** The number of glyphs in the font. */
int numGlyphs;
- TTFTableMAXP (final TTFFont ttfFile) throws IOException {
+ TTFTableMAXP(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -90,7 +90,7 @@
private int[] languageArray;
private int[] nameArray;
- TTFTableNAME (final TTFFont ttfFile) throws IOException {
+ TTFTableNAME(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -38,7 +38,7 @@
int sTypoAscender = 0;
int sTypoDescender = 0;
- TTFTableOS2 (final TTFFont ttfFile) throws IOException {
+ TTFTableOS2(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePCLT.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/f...
[truncated message content] |