[FOray-commit] SF.net SVN: foray: [7991] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7991] trunk/foray
|
From: <vic...@us...> - 2006-09-08 02:37:49
|
Revision: 7991
http://svn.sourceforge.net/foray/?rev=7991&view=rev
Author: victormote
Date: 2006-09-07 19:36:30 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
trunk/foray/foray-common/src/java/org/foray/common/Environment.java
trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java
trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java
trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java
trunk/foray/foray-font/src/java/org/foray/font/Subset.java
trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java
trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java
trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.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/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.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/LineHeight.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.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/FnMax.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.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/PDFFunction.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/object/PDFPattern.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFResources.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSReal.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCIIHexFilter.java
trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java
trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -354,8 +354,8 @@
SessionConfig.PRECEDENCE_COMMAND_LINE)) {
return true;
}
- return (this.rendererOptions.parseOption(key, value,
- OutputConfig.PRECEDENCE_COMMAND_LINE));
+ return this.rendererOptions.parseOption(key, value,
+ OutputConfig.PRECEDENCE_COMMAND_LINE);
}
private void setOutputMode(final int mode) throws FOrayException {
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:53:21 UTC (rev 7990)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -84,7 +84,7 @@
}
public boolean generatedByExists() {
- return (generatedBy != null);
+ return generatedBy != null;
}
public String generatedByName() {
@@ -345,8 +345,8 @@
int x = prOriginX();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
// Our BP Axis is vertical
- final boolean goingRight = (this.traitIPDirectionOdd()
- == Constants.DIRECTION_LEFT_TO_RIGHT);
+ final boolean goingRight = this.traitIPDirectionOdd()
+ == Constants.DIRECTION_LEFT_TO_RIGHT;
if (goingRight) {
x -= this.traitBorderStartWidth();
} else {
@@ -354,8 +354,8 @@
}
} else {
// Our BP Axis is horizontal
- final boolean goingRight = (this.traitBPDirection()
- == Constants.DIRECTION_LEFT_TO_RIGHT);
+ final boolean goingRight = this.traitBPDirection()
+ == Constants.DIRECTION_LEFT_TO_RIGHT;
if (goingRight) {
x -= this.traitBorderBeforeWidth();
} else {
@@ -375,8 +375,8 @@
int y = prOriginY();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
// Our BP Axis is vertical
- final boolean goingDown = (this.traitBPDirection()
- == Constants.DIRECTION_TOP_TO_BOTTOM);
+ final boolean goingDown = this.traitBPDirection()
+ == Constants.DIRECTION_TOP_TO_BOTTOM;
if (goingDown) {
y += this.traitBorderBeforeWidth();
} else {
@@ -384,8 +384,8 @@
}
} else {
// Our BP Axis is horizontal
- final boolean goingUp = (this.traitIPDirectionOdd()
- == Constants.DIRECTION_BOTTOM_TO_TOP);
+ final boolean goingUp = this.traitIPDirectionOdd()
+ == Constants.DIRECTION_BOTTOM_TO_TOP;
if (goingUp) {
y -= this.traitBorderStartWidth();
} else {
@@ -445,8 +445,8 @@
int x = crOriginX();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
// Our BP Axis is vertical
- final boolean goingRight = (this.traitIPDirectionOdd()
- == Constants.DIRECTION_LEFT_TO_RIGHT);
+ final boolean goingRight = this.traitIPDirectionOdd()
+ == Constants.DIRECTION_LEFT_TO_RIGHT;
if (goingRight) {
x -= this.traitPaddingStart();
} else {
@@ -454,8 +454,8 @@
}
} else {
// Our BP Axis is horizontal
- final boolean goingRight = (this.traitBPDirection()
- == Constants.DIRECTION_LEFT_TO_RIGHT);
+ final boolean goingRight = this.traitBPDirection()
+ == Constants.DIRECTION_LEFT_TO_RIGHT;
if (goingRight) {
x -= this.traitPaddingBefore();
} else {
@@ -474,8 +474,8 @@
// Start at the content-rectangle origin.
int y = crOriginY();
if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
- final boolean goingDown = (this.traitBPDirection()
- == Constants.DIRECTION_TOP_TO_BOTTOM);
+ final boolean goingDown = this.traitBPDirection()
+ == Constants.DIRECTION_TOP_TO_BOTTOM;
if (goingDown) {
y += this.traitPaddingBefore();
} else {
@@ -483,8 +483,8 @@
}
} else {
// Our BP Axis is horizontal
- final boolean goingRight = (this.traitBPDirection()
- == Constants.DIRECTION_LEFT_TO_RIGHT);
+ final boolean goingRight = this.traitBPDirection()
+ == Constants.DIRECTION_LEFT_TO_RIGHT;
if (goingRight) {
y -= this.traitPaddingBefore();
} else {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -115,7 +115,7 @@
* @return AreaContainer The next column area
*/
public NormalFlowRA addSpanArea(final int numColumns) {
- final SpanRA spanArea = new SpanRA(((RegionBody) traitGeneratedBy()),
+ final SpanRA spanArea = new SpanRA((RegionBody) traitGeneratedBy(),
this, numColumns);
this.isNewSpanArea = true;
return spanArea.getCurrentColumnArea();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -175,7 +175,7 @@
*/
public int crOriginIPDOffset() {
// Add the extent of the region-start.
- final PageRA page = ((PageRA) getParentArea());
+ final PageRA page = (PageRA) getParentArea();
if (page.getRegionStart() == null) {
return 0;
}
@@ -187,7 +187,7 @@
*/
public int crOriginBPDOffset() {
// Add the extent of the region-before.
- final PageRA page = ((PageRA) getParentArea());
+ final PageRA page = (PageRA) getParentArea();
if (page.getRegionBefore() == null) {
return 0;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -121,7 +121,7 @@
}
public boolean isLastColumn() {
- return (currentColumn == traitColumnCount());
+ return currentColumn == traitColumnCount();
}
public Area getOverflowArea(final Area childRequesting)
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -179,7 +179,7 @@
int minIPD;
int maxIPD;
- final boolean bHasProportionalUnits = (totalTableUnits > 0.0);
+ final boolean bHasProportionalUnits = totalTableUnits > 0.0;
if (node.traitIPDimensionMax(this, maxAllocationIPD) >= 0) {
maxIPD = node.traitIPDimensionMax(this, maxAllocationIPD);
} else {
@@ -266,8 +266,8 @@
int colWidth = -1;
if (column.traitColumnWidthTableUnits() > 0) {
//Proportional width
- colWidth = ((int)(column.traitColumnWidthTableUnits()
- * dUnitLength));
+ colWidth = (int) (column.traitColumnWidthTableUnits()
+ * dUnitLength);
} else {
//Fixed width
colWidth = column.traitColumnWidth(this, tableWidth);
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-common/src/java/org/foray/common/Environment.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -63,7 +63,7 @@
} catch (final InternalError e1) {
return false;
}
- return (ge != null);
+ return ge != null;
}
/**
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -269,7 +269,7 @@
final int byte2 = readUnsignedByte();
final int byte3 = readUnsignedByte();
final int byte4 = readUnsignedByte();
- return ((byte4 << 24) + (byte3 << 16) + (byte2 << 8) + (byte1 << 0));
+ return (byte4 << 24) + (byte3 << 16) + (byte2 << 8) + (byte1 << 0);
}
@@ -282,7 +282,7 @@
public int readUnsignedShortLoHi() throws IOException {
final int byte1 = readUnsignedByte();
final int byte2 = readUnsignedByte();
- return ((byte2 << 8) + (byte1 << 0));
+ return (byte2 << 8) + (byte1 << 0);
}
/**
@@ -294,7 +294,7 @@
public int readShortLoHi() throws IOException {
final int byte1 = readByte();
final int byte2 = readByte();
- return ((byte2 << 8) + (byte1 << 0));
+ return (byte2 << 8) + (byte1 << 0);
}
/**
Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -130,7 +130,7 @@
*/
public final boolean readBoolean() throws IOException {
final int ch = readUnsignedByte();
- return (ch != 0);
+ return ch != 0;
}
/**
@@ -195,7 +195,7 @@
final int byte2 = this.readUnsignedByte();
final int byte3 = this.readUnsignedByte();
final int byte4 = this.readUnsignedByte();
- return ((byte1 << 24) + (byte2 << 16) + (byte3 << 8) + (byte4 << 0));
+ return (byte1 << 24) + (byte2 << 16) + (byte3 << 8) + (byte4 << 0);
}
/**
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -603,7 +603,7 @@
final String expanded = XMLCharacter.expandEntityReference(c);
buffer.replace(i, i + 1, expanded);
/* Advance the counter past the replaced text. */
- i += (expanded.length() - 1);
+ i += expanded.length() - 1;
}
}
return buffer.toString().toCharArray();
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -100,7 +100,7 @@
}
public boolean subSetting() {
- return (this.subset != null);
+ return this.subset != null;
}
public Log getLogger() {
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -489,7 +489,7 @@
}
if (fontFamilyAliases.containsKey(alias)) {
final RegisteredFontFamily family =
- ((RegisteredFontFamily)fontFamilyAliases.get(alias));
+ (RegisteredFontFamily) fontFamilyAliases.get(alias);
throw new FontException("Alias " + alias
+ " already registered to family " + family.getName());
}
@@ -689,7 +689,7 @@
*/
public boolean isRegisteredFontFamily(final String name) {
final RegisteredFontFamily rff = this.getRegisteredFontFamily(name);
- return (rff != null);
+ return rff != null;
}
/**
@@ -803,7 +803,7 @@
*/
public boolean isRegisteredFont(final String fontID) {
final Object object = this.registeredFonts.get(fontID);
- return (object != null);
+ return object != null;
}
/**
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -224,7 +224,7 @@
}
/* Can my encoding encode it? */
final int encodedChar = this.encoding.encodeCharacter(codePoint);
- return (encodedChar != 0);
+ return encodedChar != 0;
}
/**
@@ -383,7 +383,7 @@
}
public boolean subSetting() {
- return (this.getSubset() != null);
+ return this.getSubset() != null;
}
/**
Modified: trunk/foray/foray-font/src/java/org/foray/font/Subset.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/Subset.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/Subset.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -274,7 +274,7 @@
final int index = StringUtil.indexOfSortedCharArray(
this.originalByOriginal, (char) originalGlyphIndex, 0,
this.numGlyphsUsed() - 1);
- return (index > -1);
+ return index > -1;
}
public Log getLogger() {
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -101,7 +101,7 @@
*/
public int getDescender(final int fontSize) {
final FontMetrics fm = getSizedFont(fontSize);
- return (-1 * SystemFont.MILLIPOINT_CONVERSION_FACTOR * fm.getDescent());
+ return -1 * SystemFont.MILLIPOINT_CONVERSION_FACTOR * fm.getDescent();
}
/**
@@ -377,7 +377,7 @@
* If so, returns it.
* If not, creates and caches new one with the new size.
*/
- final float s = (fontSize / 1000f);
+ final float s = fontSize / 1000f;
/* Get local copies to make sure thread-safe. */
final FontMetrics lastFontMetrics = this.lastMetrics;
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -196,7 +196,7 @@
}
public boolean isEmpty() {
- return (lastIndex < 0);
+ return lastIndex < 0;
}
private void sortKerning() {
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -306,7 +306,7 @@
}
public boolean getIsProportional() {
- return ((dfPitchAndFamily & 1) == 1);
+ return (dfPitchAndFamily & 1) == 1;
}
/**
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -54,7 +54,7 @@
protected void readFile() throws IOException {
this.ttcHeader = new TTCTableHeader(this);
this.tableDirectories = new TTFTableDirectory[ttcHeader.numDirectories];
- for (int i = 0; (i < ttcHeader.numDirectories); i++) {
+ for (int i = 0; i < ttcHeader.numDirectories; i++) {
final TTFTableDirectory tableDir = new TTFTableDirectory(this,
ttcHeader.dirOffsets[i]);
tableDirectories[i] = tableDir;
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -275,7 +275,7 @@
final int glyphLength = computeGlyphLength(origGlyphIndex);
writeULong(byteArray, i * 4, endOffset);
if ((endOffset + glyphLength) > endOffset) {
- endOffset = (endOffset + glyphLength);
+ endOffset = endOffset + glyphLength;
}
}
// Write the "extra" entry
@@ -590,7 +590,7 @@
final long position = glyfTableDirEntry.getOffset()
+ glyphOffset;
in.seek(position);
- final boolean glyphIsComposite = (in.readShort() < 0);
+ final boolean glyphIsComposite = in.readShort() < 0;
/* Return to the original location. */
in.seek(cp);
if (glyphIsComposite
@@ -735,7 +735,7 @@
i++;
}
- return (i - 1);
+ return i - 1;
}
private long getCheckSum(final byte[] byteArray, final int start,
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -183,7 +183,7 @@
= glyphIdArrayOffset
+ ((rangeOffset[i] / 2)
+ (j - startCount[i])
- + (i) - segCountX2 / 2)
+ + i - segCountX2 / 2)
* 2;
getReader().seek(glyphOffset);
final char glyphIndex =
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -97,15 +97,15 @@
}
private boolean isHorizontal(final short coverage) {
- return ((coverage & 0x0001) == 0x0001);
+ return (coverage & 0x0001) == 0x0001;
}
private boolean hasMinimums(final short coverage) {
- return ((coverage & 0x0002) == 0x0002);
+ return (coverage & 0x0002) == 0x0002;
}
private boolean isCrossStream(final short coverage) {
- return ((coverage & 0x0004) == 0x0004);
+ return (coverage & 0x0004) == 0x0004;
}
private short subtableFormat(final short coverage) {
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -590,8 +590,8 @@
public boolean inlineWrapOption(final FOContext context) {
final FObj effectiveParent = effectiveParent(context);
- return (effectiveParent.traitWrapOption(context)
- == Constants.FOVAL_WRAP);
+ return effectiveParent.traitWrapOption(context)
+ == Constants.FOVAL_WRAP;
}
public boolean inlineHyphenate() {
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -242,7 +242,7 @@
}
public boolean hasData() {
- return (rootFObj != null);
+ return rootFObj != null;
}
public Log getLogger() {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -171,7 +171,7 @@
*/
protected boolean regionNameExists(final String regionName) {
final String regionClass = (String) this.regionMap.get(regionName);
- return (regionClass != null);
+ return regionClass != null;
}
public Namespace getNamespace() {
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:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -70,9 +70,9 @@
return null;
}
this.lastDocumentPageNumber ++;
+ final boolean lastPageOdd = (this.lastDocumentPageNumber % 2) == 1;
final org.foray.fotree.fo.obj.SimplePageMaster spm =
- getNextSimplePageMaster(
- ((this.lastDocumentPageNumber % 2) == 1), isBlank, psm);
+ getNextSimplePageMaster(lastPageOdd, isBlank, psm);
return spm;
}
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:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -140,13 +140,13 @@
* @return true if the name parameter is a reserved region name
*/
protected boolean isReserved(final String name) throws FOTreeException {
- return (name.equals("xsl-region-before")
+ return name.equals("xsl-region-before")
|| name.equals("xsl-region-start")
|| name.equals("xsl-region-end")
|| name.equals("xsl-region-after")
|| name.equals("xsl-region-body")
|| name.equals("xsl-before-float-separator")
- || name.equals("xsl-footnote-separator"));
+ || name.equals("xsl-footnote-separator");
}
public boolean isRAGenerator() {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -73,13 +73,13 @@
if (subPropertyName.equals("block-progression-direction")) {
pv = standardParse(propertyList, value, false, false);
if (pv instanceof DtLength) {
- return new DtLengthBPIPDirection(((DtLength) pv), null);
+ return new DtLengthBPIPDirection((DtLength) pv, null);
}
}
if (subPropertyName.equals("inline-progression-direction")) {
pv = standardParse(propertyList, value, false, false);
if (pv instanceof DtLength) {
- return new DtLengthBPIPDirection(null, ((DtLength) pv));
+ return new DtLengthBPIPDirection(null, (DtLength) pv);
}
}
throw unexpectedValue(value, 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-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -55,13 +55,13 @@
final String value) throws PropertyException {
final PropertyValue pv = standardParse(propertyList, value, false,
false);
- if ((pv instanceof DtLength)) {
+ if (pv instanceof DtLength) {
return pv;
}
- if ((pv instanceof DtPercentage)) {
+ if (pv instanceof DtPercentage) {
return pv;
}
- if ((pv instanceof FnProportionalColWidth)) {
+ if (pv instanceof FnProportionalColWidth) {
// Used to store proportional column width
return pv;
}
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -200,7 +200,7 @@
public static int getValueNoInstance(final FOContext context,
final FObj fobj) {
- return (int) Math.round((fobj.traitFontSize(context) * 1.2));
+ return (int) Math.round(fobj.traitFontSize(context) * 1.2);
}
public static float getValueMultiplierNoInstance(final FOContext context,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -102,7 +102,7 @@
* interpretd from that.
*/
final Padding newPadding = new Padding(propertyList,
- ((byte) -1), null, st.nextToken());
+ (byte) -1, null, st.nextToken());
if (newPadding != null) {
collection.addItem(newPadding);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -136,10 +136,10 @@
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
switch (propertyType) {
- case (Constants.FOPROP_PAUSE_BEFORE): {
+ case Constants.FOPROP_PAUSE_BEFORE: {
return parent.traitPauseBefore(context);
}
- case (Constants.FOPROP_PAUSE_AFTER): {
+ case Constants.FOPROP_PAUSE_AFTER: {
return parent.traitPauseAfter(context);
}
}
@@ -160,10 +160,10 @@
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
switch (propertyType) {
- case (Constants.FOPROP_PAUSE_BEFORE): {
+ case Constants.FOPROP_PAUSE_BEFORE: {
return parent.traitPauseBefore(context);
}
- case (Constants.FOPROP_PAUSE_AFTER): {
+ case Constants.FOPROP_PAUSE_AFTER: {
return parent.traitPauseAfter(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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -173,7 +173,7 @@
}
}
if (this.value instanceof DtTextDeco) {
- return ((DtTextDeco) this.value);
+ return (DtTextDeco) this.value;
}
return null;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -57,7 +57,7 @@
public ExprNumeric eval()
throws PropertyException {
- final ExprNumeric numeric = ((ExprNumeric) args[0]);
+ final ExprNumeric numeric = (ExprNumeric) args[0];
final double value = Math.ceil(numeric.getNumericValue());
return new DtNumber(value);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -56,7 +56,7 @@
}
public ExprNumeric eval() throws PropertyException {
- final ExprNumeric numeric = ((ExprNumeric) args[0]);
+ final ExprNumeric numeric = (ExprNumeric) args[0];
final double value = Math.floor(numeric.getNumericValue());
return new DtNumber(value);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -59,8 +59,8 @@
}
public ExprNumeric eval() throws PropertyException {
- final ExprNumeric numeric1 = ((ExprNumeric) args[0]);
- final ExprNumeric numeric2 = ((ExprNumeric) args[1]);
+ final ExprNumeric numeric1 = (ExprNumeric) args[0];
+ final ExprNumeric numeric2 = (ExprNumeric) args[1];
final double value = Math.max(numeric1.getNumericValue(),
numeric2.getNumericValue());
return new DtNumber(value);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -61,8 +61,8 @@
public ExprNumeric eval(final PropertyList propertyList)
throws PropertyException {
//Already validated as existing and as Numeric at parse-time.
- final ExprNumeric numeric1 = ((ExprNumeric) args[0]);
- final ExprNumeric numeric2 = ((ExprNumeric) args[1]);
+ final ExprNumeric numeric1 = (ExprNumeric) args[0];
+ final ExprNumeric numeric2 = (ExprNumeric) args[1];
final double value = Math.min(numeric1.getNumericValue(),
numeric2.getNumericValue());
return new DtNumber(value);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -60,7 +60,7 @@
if (pv instanceof DtInteger) {
return (DtInteger) pv;
}
- final ExprNumeric numeric = ((ExprNumeric) pv);
+ final ExprNumeric numeric = (ExprNumeric) pv;
final long value = Math.round(numeric.getNumericValue());
return new DtInteger((int) value);
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -211,7 +211,7 @@
System.arraycopy(fileStart, idx, num, 0, nidx - idx);
final String ns = new String(num);
this.bbox[bboxIndex] = Integer.parseInt(ns);
- return (1 + nidx - idx);
+ return 1 + nidx - idx;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -102,7 +102,7 @@
Class aClass = Class.forName(
"com.sun.media.jai.codec.FileCacheSeekableStream");
aClass = Class.forName("javax.media.jai.JAI");
- this.jaiAvailable = (aClass != null);
+ this.jaiAvailable = aClass != null;
} catch (final ClassNotFoundException e) {
this.jaiAvailable = false;
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -102,7 +102,7 @@
final int p = tmpMap[i * this.pixelWidth + j];
final int r = (p >> 16) & 0xFF;
final int g = (p >> 8) & 0xFF;
- final int b = (p) & 0xFF;
+ final int b = p & 0xFF;
this.content[3 * (i * this.pixelWidth + j)] = (byte)(r & 0xFF);
this.content[3 * (i * this.pixelWidth + j) + 1] = (byte)(g
& 0xFF);
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -87,7 +87,7 @@
final int p = tmpMap[i * this.pixelWidth + j];
final int r = (p >> 16) & 0xFF;
final int g = (p >> 8) & 0xFF;
- final int b = (p) & 0xFF;
+ final int b = p & 0xFF;
this.content[3 * (i * this.pixelWidth + j)] = (byte)(r
& 0xFF);
this.content[3 * (i * this.pixelWidth + j) + 1] = (byte)(g
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-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -226,11 +226,11 @@
private boolean hasAPPEMarker(final int index) {
//hasAPPEMarker = true;
- return (uByte(this.content[index]) == 0xff &&
+ return uByte(this.content[index]) == 0xff &&
uByte(this.content[index+1]) == 0xee &&
uByte(this.content[index+2]) == 0 &&
uByte(this.content[index+3]) == 14 &&
- "Adobe".equals(new String(this.content, index+4, 5)));
+ "Adobe".equals(new String(this.content, index+4, 5));
}
/*
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -61,14 +61,14 @@
int byte3 = header[18] & 0xff;
int byte4 = header[19] & 0xff;
long l = (byte1 << 24) | (byte2 << 16) | (byte3 << 8) | byte4;
- this.pixelWidth = (int)(l);
+ this.pixelWidth = (int) l;
byte1 = header[20] & 0xff;
byte2 = header[21] & 0xff;
byte3 = header[22] & 0xff;
byte4 = header[23] & 0xff;
l = (byte1 << 24) | (byte2 << 16) | (byte3 << 8) | byte4;
- this.pixelHeight = (int)(l);
+ this.pixelHeight = (int) l;
}
public String getName() {
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -50,8 +50,8 @@
throws IOException {
final byte[] header = new byte[BMPGraphic.BMP_SIG_LENGTH];
bis.read(header);
- final boolean supported = ((header[0] == (byte)0x42)
- && (header[1] == (byte)0x4d));
+ final boolean supported = (header[0] == (byte) 0x42)
+ && (header[1] == (byte) 0x4d);
if (! supported) {
return null;
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -51,10 +51,10 @@
throws IOException {
final byte[] header = new byte[GIFGraphic.GIF_SIG_LENGTH];
bis.read(header);
- final boolean supported = ((header[0] == 'G') && (header[1] == 'I')
+ final boolean supported = (header[0] == 'G') && (header[1] == 'I')
&& (header[2] == 'F') && (header[3] == '8')
&& (header[4] == '7' || header[4] == '9')
- && (header[5] == 'a'));
+ && (header[5] == 'a');
if (! supported) {
return null;
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -52,8 +52,8 @@
throws IOException {
final byte[] header = new byte[JPEGGraphic.JPG_SIG_LENGTH];
bis.read(header);
- final boolean supported = ((header[0] == (byte)0xff)
- && (header[1] == (byte)0xd8));
+ final boolean supported = (header[0] == (byte)0xff)
+ && (header[1] == (byte)0xd8);
if (! supported) {
return null;
}
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -52,14 +52,14 @@
final byte[] header = new byte[PNGGraphic.PNG_SIG_LENGTH];
bis.read(header);
final boolean supported
- = ((header[0] == (byte) 0x89) // HTJ control character
+ = (header[0] == (byte) 0x89) // HTJ control character
&& (header[1] == (byte) 0x50) // P
&& (header[2] == (byte) 0x4e) // N
&& (header[3] == (byte) 0x47) // G
&& (header[4] == (byte) 0x0d) // \r carriage-return
&& (header[5] == (byte) 0x0a) // \n newline
&& (header[6] == (byte) 0x1a) // SUB control character
- && (header[7] == (byte) 0x0a)); // \n newline
+ && (header[7] == (byte) 0x0a); // \n newline
if (! supported) {
return null;
}
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -354,7 +354,7 @@
/* TODO: After Java 5 is the minimum, use the standard String
* constructor instead. */
final String string = StringUtilPre5.newString(characters, wordStart,
- (characters.length - wordStart));
+ characters.length - wordStart);
/* FIXME: Return value needs to be reduced by the number of surrogate
* pairs (an int that would convert to 2 chars) found.*/
return wordSize(string, wordStart, language, country);
@@ -406,7 +406,7 @@
/* TODO: After Java 5 is the minimum, use the standard String
* constructor instead. */
final String string = StringUtilPre5.newString(characters, startIndex,
- (characters.length - startIndex));
+ characters.length - startIndex);
/* FIXME: Return value needs to be reduced by the number of surrogate
* pairs (an int that would convert to 2 chars) found.*/
return wordStarts(string, startIndex, language, country);
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:53:21 UTC (rev 7990)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -338,7 +338,7 @@
}
public boolean knows(final String key) {
- return (find(key) >= 0);
+ return find(key) >= 0;
}
// redimension the arrays
@@ -549,7 +549,7 @@
}
public boolean hasMoreElements() {
- return (cur != -1);
+ return cur != -1;
}
/**
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -72,16 +72,16 @@
return null;
}
if (colorSpace.getType() == ColorSpace.TYPE_RGB) {
- return ("DeviceRGB");
+ return "DeviceRGB";
}
if (colorSpace.getType() == ColorSpace.TYPE_CMYK) {
- return ("DeviceCMYK");
+ return "DeviceCMYK";
}
if (colorSpace.getType() == ColorSpace.TYPE_GRAY) {
- return ("DeviceGray");
+ return "DeviceGray";
}
// unknown... Error. Tell them it's RGB and hope they don't notice.
- return ("DeviceRGB");
+ return "DeviceRGB";
}
public boolean isBlack() {
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -650,7 +650,7 @@
String functionsFraction
= PSReal.doubleOut(new Double(1.0
- / (numberOfFunctions)));
+ / numberOfFunctions));
for (tempInt = 0; tempInt + 1 < numberOfFunctions;
tempInt++) {
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -65,7 +65,7 @@
}
pb.append("/Length ");
- pb.append((streamData.size() + 1));
+ pb.append(streamData.size() + 1);
pb.append(" ");
pb.append(filterEntry);
pb.append(" >>" + EOL);
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -50,7 +50,7 @@
* {@inheritDoc}
*/
public String getColorSpaceOut(final boolean fillNotStroke) {
- return ("");
+ return "";
}
public void setColorSpace(final ColorSpace theColorSpace) {
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 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -196,10 +196,10 @@
public String getColorSpaceOut(final boolean fillNotStroke) {
if (fillNotStroke) {
// fill but no stroke
- return ("/Pattern cs /" + this.getName() + " scn" + EOL);
+ return "/Pattern cs /" + this.getName() + " scn" + EOL;
}
// stroke (or border)
- return ("/Pattern CS /" + this.getName() + " SCN" + EOL);
+ return "/Pattern CS /" + this.getName() + " SCN" + EOL;
}
public static PDFPattern createGradient(final boolean radial,
@@ -278,7 +278,7 @@
}
myPattern = new PDFPattern(document, 2, myShad, null,
null, null);
- return (myPattern);
+ return myPattern;
}
static ArrayList colorToDoubleList(final Color theColor) {
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFResources.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFResources.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFResources.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -102,7 +102,7 @@
currentShadingNumber < this.shadings.size();
currentShadingNumber++) {
currentShading =
- ((PDFShading)this.shadings.get(currentShadingNumber));
+ (PDFShading) this.shadings.get(currentShadingNumber);
p.append("/" + currentShading.getName() + " "
+ currentShading.pdfReference() + EOL);
}
@@ -118,7 +118,7 @@
currentPatternNumber < this.patterns.size();
currentPatternNumber++) {
currentPattern =
- ((PDFPattern)this.patterns.get(currentPatternNumber));
+ (PDFPattern) this.patterns.get(currentPatternNumber);
p.append("/" + currentPattern.getName() + " "
+ currentPattern.pdfReference() + EOL);
}
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -127,7 +127,7 @@
return;
}
buf.append(endTextDelimiter());
- buf.append(-(kernAmount));
+ buf.append(- kernAmount);
buf.append(' ');
buf.append(startTextDelimiter());
}
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -59,7 +59,7 @@
protected void xObjectContent(final PDFStream stream)
throws GraphicException, IOException {
- final byte[] imgData = epsToPDFXObject(((EPSGraphic) graphic));
+ final byte[] imgData = epsToPDFXObject((EPSGraphic) graphic);
stream.setData(imgData);
}
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:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -358,7 +358,7 @@
// mask[maskpos++] = (byte)((idata[i][j] >> 24) & 0xFF);
if (alpha != 255) {
// Composite with opaque white...
- add = (255 - alpha);
+ add = 255 - alpha;
mult = (alpha << 16) / 255;
result[count++] =
(byte)(add
@@ -367,12 +367,12 @@
(byte)(add
+ ((((val >> 8) & 0xFF) * mult) >> 16));
result[count++] = (byte)(add
- + ((((val) & 0xFF) * mult)
+ + (((val & 0xFF) * mult)
>> 16));
} else {
result[count++] = (byte)((val >> 16) & 0xFF);
result[count++] = (byte)((val >> 8) & 0xFF);
- result[count++] = (byte)((val) & 0xFF);
+ result[count++] = (byte)(val & 0xFF);
}
}
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-09-08 01:53:21 UTC (rev 7990)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-09-08 02:36:30 UTC (rev 7991)
@@ -127,7 +127,7 @@...
[truncated message content] |
