[FOray-commit] SF.net SVN: foray: [7983] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7983] trunk/foray
|
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/font/format/TTFTablePCLT.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePCLT.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -38,7 +38,7 @@
int xHeight = 0;
boolean hasSerifs = true;
- TTFTablePCLT (final TTFFont ttfFile) throws IOException {
+ TTFTablePCLT(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -58,7 +58,7 @@
// Set this to true if the PostScript names should be read.
private boolean readingPostScriptNames = false;
- TTFTablePOST (final TTFFont ttfFile) throws IOException {
+ TTFTablePOST(final TTFFont ttfFile) throws IOException {
super(ttfFile);
parseTable();
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -210,8 +210,8 @@
+ padHexString(Integer.toHexString(i), 4)
+ "> ");
p.append("<"
- + padHexString(Integer.toHexString
- (endOfRange(charArray, i)), 4)
+ + padHexString(Integer.toHexString(endOfRange(
+ charArray, i)), 4)
+ "> ");
p.append("<"
+ padHexString(Integer.toHexString(charArray[i]), 4)
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -270,7 +270,7 @@
* FOTreeEvent firings.
* @param listener the Object which should be notified
*/
- public void registerListener (final FOTreeListener listener) {
+ public void registerListener(final FOTreeListener listener) {
if (listener == null) {
return;
}
@@ -285,7 +285,7 @@
* about FOTreeEvent firings.
* @param listener the Object which should no longer be notified
*/
- public void removeFOTreeListener (final FOTreeListener listener) {
+ public void removeFOTreeListener(final FOTreeListener listener) {
if (listener == null) {
return;
}
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-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -413,8 +413,8 @@
}
public short getWrapOption(final FOContext context) {
- Enumerated property = (Enumerated) getProperty
- (Constants.FOPROP_WRAP_OPTION);
+ Enumerated property = (Enumerated) getProperty(
+ Constants.FOPROP_WRAP_OPTION);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -433,8 +433,8 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_WRAP_OPTION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_WRAP_OPTION, fobj);
}
public boolean getWhiteSpaceCollapse(final FOContext context) {
@@ -524,8 +524,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SPAN, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SPAN, fobj);
}
public String getFlowName() {
@@ -560,8 +560,8 @@
if (property != null) {
return property.getValue();
}
- return Enumerated.getValueNoInstance
- (Constants.FOPROP_RETRIEVE_POSITION);
+ return Enumerated.getValueNoInstance(
+ Constants.FOPROP_RETRIEVE_POSITION);
}
public short getRetrieveBoundary() {
@@ -570,8 +570,8 @@
if (property != null) {
return property.getValue();
}
- return Enumerated.getValueNoInstance
- (Constants.FOPROP_RETRIEVE_BOUNDARY);
+ return Enumerated.getValueNoInstance(
+ Constants.FOPROP_RETRIEVE_BOUNDARY);
}
public int getColumnNumber(final FOContext context) {
@@ -607,8 +607,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_BORDER_COLLAPSE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_BORDER_COLLAPSE, fobj);
}
public short getDisplayAlign(final FOContext context) {
@@ -626,8 +626,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_RELATIVE_ALIGN, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_RELATIVE_ALIGN, fobj);
}
public int getBorderSeparationIPD(final FOContext context) {
@@ -716,8 +716,8 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_BREAK_AFTER, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_BREAK_AFTER, fobj);
}
public int getKeepTogether(final FOContext context,
@@ -879,8 +879,8 @@
if (property != null) {
return property.getValue(null, fobj);
}
- return Enumerated.getValueNoInstance
- (Constants.FOPROP_BLANK_OR_NOT_BLANK);
+ return Enumerated.getValueNoInstance(
+ Constants.FOPROP_BLANK_OR_NOT_BLANK);
}
public int getInitialPageNumber(final int lastPageNumberUsed) {
@@ -1007,8 +1007,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_OVERFLOW, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_OVERFLOW, fobj);
}
public int getColumnCount(final FOContext context) {
@@ -1312,8 +1312,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_POSITION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_POSITION, fobj);
}
public int getAbsoluteOffset(final FOContext context,
@@ -1397,8 +1397,8 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_BREAK_BEFORE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_BREAK_BEFORE, fobj);
}
public short getScaling(final FOContext context) {
@@ -1407,8 +1407,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SCALING, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SCALING, fobj);
}
public ContentDimension getContentDimensionProperty(
@@ -1457,8 +1457,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_LEADER_PATTERN, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_LEADER_PATTERN, fobj);
}
private int getLeaderLength(final FOContext context, final byte subProperty,
@@ -1513,8 +1513,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_RULE_STYLE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_RULE_STYLE, fobj);
}
/**
@@ -1539,8 +1539,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_LEADER_ALIGNMENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_LEADER_ALIGNMENT, fobj);
}
public String getRefId(final FOContext context) {
@@ -1612,36 +1612,36 @@
if (absoluteAxis == Constants.AXIS_HORIZONTAL) {
switch (subProperty) {
case Property.MINIMUM: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_MIN_WIDTH);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_MIN_WIDTH);
break;
}
case Property.MAXIMUM: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_MAX_WIDTH);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_MAX_WIDTH);
break;
}
default: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_WIDTH);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_WIDTH);
break;
}
}
} else if (absoluteAxis == Constants.AXIS_VERTICAL){
switch (subProperty) {
case Property.MINIMUM: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_MIN_HEIGHT);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_MIN_HEIGHT);
break;
}
case Property.MAXIMUM: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_MAX_HEIGHT);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_MAX_HEIGHT);
break;
}
default: {
- absDimProperty = (AbsoluteDimension) getProperty
- (Constants.FOPROP_HEIGHT);
+ absDimProperty = (AbsoluteDimension) getProperty(
+ Constants.FOPROP_HEIGHT);
break;
}
}
@@ -2036,8 +2036,8 @@
}
public Graphic getBackgroundImage(final FOContext context) {
- BackgroundImage property = (BackgroundImage) getProperty
- (Constants.FOPROP_BACKGROUND_IMAGE);
+ BackgroundImage property = (BackgroundImage) getProperty(
+ Constants.FOPROP_BACKGROUND_IMAGE);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -2068,13 +2068,13 @@
return property.getValue(context, fobj);
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_BACKGROUND_REPEAT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_BACKGROUND_REPEAT, fobj);
}
public String[] getSourceDocument(final FOContext context) {
- final SourceDocument property = (SourceDocument) getProperty
- (Constants.FOPROP_SOURCE_DOCUMENT);
+ final SourceDocument property = (SourceDocument) getProperty(
+ Constants.FOPROP_SOURCE_DOCUMENT);
if (property == null) {
return SourceDocument.getValueNoInstance();
}
@@ -2465,8 +2465,8 @@
return property.getValue(context, fobj);
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_BACKGROUND_ATTACHMENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_BACKGROUND_ATTACHMENT, fobj);
}
public short traitCaptionSide(final FOContext context) {
@@ -2475,8 +2475,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_CAPTION_SIDE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_CAPTION_SIDE, fobj);
}
public short traitDirection(final FOContext context) {
@@ -2485,18 +2485,18 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_DIRECTION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_DIRECTION, fobj);
}
public short traitFontSelectionStrategy(final FOContext context) {
- final Enumerated property = (Enumerated) getProperty
- (Constants.FOPROP_FONT_SELECTION_STRATEGY);
+ final Enumerated property = (Enumerated) getProperty(
+ Constants.FOPROP_FONT_SELECTION_STRATEGY);
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_FONT_SELECTION_STRATEGY, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_FONT_SELECTION_STRATEGY, fobj);
}
public short traitHyphenationKeep(final FOContext context) {
@@ -2505,8 +2505,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_HYPHENATION_KEEP, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_HYPHENATION_KEEP, fobj);
}
public short traitLinefeedTreatment(final FOContext context) {
@@ -2530,28 +2530,28 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_LINEFEED_TREATMENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_LINEFEED_TREATMENT, fobj);
}
public short traitLineHeightShiftAdjustment(final FOContext context) {
- final Enumerated property = (Enumerated) getProperty
- (Constants.FOPROP_LINE_HEIGHT_SHIFT_ADJUSTMENT);
+ final Enumerated property = (Enumerated) getProperty(
+ Constants.FOPROP_LINE_HEIGHT_SHIFT_ADJUSTMENT);
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_LINE_HEIGHT_SHIFT_ADJUSTMENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_LINE_HEIGHT_SHIFT_ADJUSTMENT, fobj);
}
public short traitLineStackingStrategy(final FOContext context) {
- final Enumerated property = (Enumerated) getProperty
- (Constants.FOPROP_LINE_STACKING_STRATEGY);
+ final Enumerated property = (Enumerated) getProperty(
+ Constants.FOPROP_LINE_STACKING_STRATEGY);
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_LINE_STACKING_STRATEGY, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_LINE_STACKING_STRATEGY, fobj);
}
public short traitRelativePosition(final FOContext context) {
@@ -2578,8 +2578,8 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_RELATIVE_POSITION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_RELATIVE_POSITION, fobj);
}
public short traitScalingMethod(final FOContext context) {
@@ -2588,18 +2588,18 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SCALING_METHOD, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SCALING_METHOD, fobj);
}
public short traitSuppressAtLineBreak(final FOContext context) {
- final Enumerated property = (Enumerated) getProperty
- (Constants.FOPROP_SUPPRESS_AT_LINE_BREAK);
+ final Enumerated property = (Enumerated) getProperty(
+ Constants.FOPROP_SUPPRESS_AT_LINE_BREAK);
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SUPPRESS_AT_LINE_BREAK, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SUPPRESS_AT_LINE_BREAK, fobj);
}
public short traitUnicodeBidi(final FOContext context) {
@@ -2608,8 +2608,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_UNICODE_BIDI, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_UNICODE_BIDI, fobj);
}
public short traitWhiteSpace(final FOContext context) {
@@ -2618,8 +2618,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_WHITE_SPACE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_WHITE_SPACE, fobj);
}
public short traitWhiteSpaceTreatment(final FOContext context) {
@@ -2643,8 +2643,8 @@
}
}
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_WHITE_SPACE_TREATMENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_WHITE_SPACE_TREATMENT, fobj);
}
public String traitCaseTitle() {
@@ -2662,8 +2662,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_ACTIVE_STATE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_ACTIVE_STATE, fobj);
}
public short traitClear(final FOContext context) {
@@ -2672,8 +2672,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_CLEAR, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_CLEAR, fobj);
}
public short traitEmptyCells(final FOContext context) {
@@ -2682,8 +2682,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_EMPTY_CELLS, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_EMPTY_CELLS, fobj);
}
public short traitFloat(final FOContext context) {
@@ -2692,8 +2692,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_FLOAT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_FLOAT, fobj);
}
public short traitMediaUsage(final FOContext context) {
@@ -2702,8 +2702,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_MEDIA_USAGE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_MEDIA_USAGE, fobj);
}
public short traitPageBreakAfter(final FOContext context) {
@@ -2712,8 +2712,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_PAGE_BREAK_AFTER, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_PAGE_BREAK_AFTER, fobj);
}
public short traitPageBreakBefore(final FOContext context) {
@@ -2722,8 +2722,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_PAGE_BREAK_BEFORE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_PAGE_BREAK_BEFORE, fobj);
}
public short traitPageBreakInside(final FOContext context) {
@@ -2732,8 +2732,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_PAGE_BREAK_INSIDE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_PAGE_BREAK_INSIDE, fobj);
}
public short traitReferenceOrientation(final FOContext context) {
@@ -2742,8 +2742,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_REFERENCE_ORIENTATION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_REFERENCE_ORIENTATION, fobj);
}
public short traitRenderingIntent(final FOContext context) {
@@ -2752,8 +2752,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_RENDERING_INTENT, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_RENDERING_INTENT, fobj);
}
public short traitShowDestination(final FOContext context) {
@@ -2762,8 +2762,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SHOW_DESTINATION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SHOW_DESTINATION, fobj);
}
public short traitSpeakHeader(final FOContext context) {
@@ -2772,8 +2772,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SPEAK_HEADER, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SPEAK_HEADER, fobj);
}
public short traitSpeak(final FOContext context) {
@@ -2782,8 +2782,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SPEAK, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SPEAK, fobj);
}
public short traitSpeakNumeral(final FOContext context) {
@@ -2792,8 +2792,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SPEAK_NUMERAL, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SPEAK_NUMERAL, fobj);
}
public short traitSpeakPunctuation(final FOContext context) {
@@ -2802,8 +2802,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_SPEAK_PUNCTUATION, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_SPEAK_PUNCTUATION, fobj);
}
public short traitStartingState(final FOContext context) {
@@ -2812,8 +2812,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_STARTING_STATE, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_STARTING_STATE, fobj);
}
public short traitTextTransform(final FOContext context) {
@@ -2822,8 +2822,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_TEXT_TRANSFORM, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_TEXT_TRANSFORM, fobj);
}
public short traitVisibility(final FOContext context) {
@@ -2832,8 +2832,8 @@
if (property != null) {
return property.getValue(context, fobj);
}
- return Enumerated.getValueNoInstance
- (context, Constants.FOPROP_VISIBILITY, fobj);
+ return Enumerated.getValueNoInstance(context,
+ Constants.FOPROP_VISIBILITY, fobj);
}
public float traitAzimuth(final FOContext context) {
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-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -172,8 +172,8 @@
public static Property makeProperty(final String propertyFullName,
final String attributeValue, final PropertyList propertyList)
throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName
- (propertyFullName);
+ final String basePropertyName = Property.getBasePropertyName(
+ propertyFullName);
final short enumeration = enumeratePropertyName(basePropertyName);
final Property property = checkCompoundProperty(propertyList,
enumeration, propertyFullName, attributeValue);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -91,8 +91,8 @@
if (siblingMarker == this) {
continue;
}
- if (this.traitMarkerClassName().equals
- (siblingMarker.traitMarkerClassName())) {
+ if (this.traitMarkerClassName().equals(
+ siblingMarker.traitMarkerClassName())) {
throwException("marker-class-name '"
+ this.traitMarkerClassName()
+ "' already exists for this parent");
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-09-08 00:23:21 UTC (rev 7982)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-09-08 01:01:57 UTC (rev 7983)
@@ -103,35 +103,8 @@
return Constants.DIMENSION_AUTO;
}
case Constants.FOVAL_INHERIT: {
- switch (getPropertyType()) {
- case Constants.FOPROP_HEIGHT:
- case Constants.FOPROP_WIDTH: {
- if (relativeAxis == Constants.AXIS_BP) {
- return fobj.effectiveParent(context).traitBPDimensionOpt
- (context, dimAncestorGenByBlockLevelFO);
- }
- return fobj.effectiveParent(context).traitIPDimensionOpt
- (context, dimAncestorGenByBlockLevelFO);
- }
- case Constants.FOPROP_MAX_HEIGHT:
- case Constants.FOPROP_MAX_WIDTH: {
- if (relativeAxis == Constants.AXIS_BP) {
- return fobj.effectiveParent(context).traitBPDimensionMax
- (context, dimAncestorGenByBlockLevelFO);
- }
- ...
[truncated message content] |
