[FOray-commit] SF.net SVN: foray: [7941] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7941] trunk/foray
|
From: <vic...@us...> - 2006-09-07 19:24:44
|
Revision: 7941
http://svn.sourceforge.net/foray/?rev=7941&view=rev
Author: victormote
Date: 2006-09-07 12:24:21 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Style changes only.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java
trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java
trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -34,7 +34,7 @@
public class CharSetWindowsANSI extends CharSet {
public CharSetWindowsANSI() {
- super("WindowsANSI", EncodingWinAnsi.codePoints);
+ super("WindowsANSI", EncodingWinAnsi.CODE_POINTS);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -48,19 +48,19 @@
final int colorSpace = color.getColorSpace().getType();
switch (colorSpace) {
case ColorSpace.TYPE_RGB: {
- return toPS_RGB(color, fillNotStroke, eol);
+ return rgbToPS(color, fillNotStroke, eol);
}
case ColorSpace.TYPE_CMYK: {
- return toPS_CMYK(color, fillNotStroke, eol);
+ return cmykToPS(color, fillNotStroke, eol);
}
default: {
- return toPS_Gray(color, fillNotStroke, eol);
+ return grayToPS(color, fillNotStroke, eol);
}
}
}
/* Colorspace is RGB. */
- private static String toPS_RGB(final Color color,
+ private static String rgbToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
@@ -98,7 +98,7 @@
}
/* Colorspace is CMYK. */
- private static String toPS_CMYK(final Color color,
+ private static String cmykToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
final float[] cmykColors = color.getComponents(null);
@@ -117,7 +117,7 @@
}
/* Colorspace is DeviceGray. */
- private static String toPS_Gray(final Color color,
+ private static String grayToPS(final Color color,
final boolean fillNotStroke, final String eol) {
final StringBuffer buffer = new StringBuffer("");
final float[] grayColors = color.getComponents(null);
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -78,10 +78,10 @@
sb.append(PSErrorDict.ERROR_NAMES[errorCode]);
sb.append(" (operator: ");
if (offendingOperator < 1
- || offendingOperator > PSOperator.operatorNames.length) {
+ || offendingOperator > PSOperator.OPERATOR_NAMES.length) {
sb.append("unknown");
} else {
- sb.append(PSOperator.operatorNames[offendingOperator]);
+ sb.append(PSOperator.OPERATOR_NAMES[offendingOperator]);
}
sb.append(") ");
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -392,7 +392,7 @@
/**
* The index into this array is the matching OPER_ constant.
*/
- protected static final String[] operatorNames = new String[] {
+ protected static final String[] OPERATOR_NAMES = new String[] {
"", // Element 0 is blank
"<<",
">>",
@@ -776,7 +776,7 @@
* @return The integer equivalent of <code>name</code>.
*/
public static short mapNameToEnum(final String name) {
- return (short) Arrays.binarySearch(operatorNames, name);
+ return (short) Arrays.binarySearch(OPERATOR_NAMES, name);
}
/**
@@ -786,10 +786,10 @@
*/
public static String mapEnumToName(final short enumeratedOperator) {
if (enumeratedOperator < 0
- || enumeratedOperator >= operatorNames.length) {
+ || enumeratedOperator >= OPERATOR_NAMES.length) {
return null;
}
- return operatorNames[enumeratedOperator];
+ return OPERATOR_NAMES[enumeratedOperator];
}
public boolean execute() throws PSException {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -55,8 +55,8 @@
void setPSInterpreter(final PSInterpreter interpreter) throws PSException {
this.interpreter = interpreter;
- for (short i = 1; i < PSOperator.operatorNames.length; i++) {
- final String operatorName = PSOperator.operatorNames[i];
+ for (short i = 1; i < PSOperator.OPERATOR_NAMES.length; i++) {
+ final String operatorName = PSOperator.OPERATOR_NAMES[i];
final PSName key = new PSName(interpreter, operatorName, true,
false);
final PSOperator value = new PSOperator(interpreter, this, i);
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -480,7 +480,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -698,7 +698,7 @@
0x2122 // #214 glyph: 0x99 \231
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -918,8 +918,8 @@
public EncodingCE() {
super("CEEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingCE.codePoints,
- EncodingCE.codePointIndexes);
+ EncodingCE.CODE_POINTS,
+ EncodingCE.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -378,7 +378,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -546,7 +546,7 @@
0xfb04 // #164 glyph: 0x5a \132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -716,8 +716,8 @@
public EncodingExpert() {
super("ExpertEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingExpert.codePoints,
- EncodingExpert.codePointIndexes);
+ EncodingExpert.CODE_POINTS,
+ EncodingExpert.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -221,7 +221,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x002c, // [1] glyph: 0x002c \0054
0x002d, // [2] glyph: 0x002d \0055
@@ -310,7 +310,7 @@
0xfb04 // [85] glyph: 0x005a \0132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x002c, // [1]
0x002d, // [2]
@@ -401,8 +401,8 @@
public EncodingExpertSubset() {
super("ExpertSubsetEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingExpertSubset.codePoints,
- EncodingExpertSubset.codePointIndexes);
+ EncodingExpertSubset.CODE_POINTS,
+ EncodingExpertSubset.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -149,7 +149,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x0100, // [1] glyph: 0x0021 \0041
0x0101, // [2] glyph: 0x0032 \0062
@@ -199,7 +199,7 @@
0xfb02 // [46] glyph: 0x0038 \0070
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x0021, // [1]
0x0032, // [2]
@@ -251,8 +251,8 @@
public EncodingFOrayLatinExtra() {
super("FOrayLatinExtraEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingFOrayLatinExtra.codePoints,
- EncodingFOrayLatinExtra.codePointIndexes);
+ EncodingFOrayLatinExtra.CODE_POINTS,
+ EncodingFOrayLatinExtra.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -448,7 +448,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -651,7 +651,7 @@
0x2212 // #199 glyph: 0x2d \55
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -856,8 +856,8 @@
public EncodingISOLatin1() {
super("ISOLatin1Encoding", GlyphList.standardSourceGlyphLists(),
- EncodingISOLatin1.codePoints,
- EncodingISOLatin1.codePointIndexes);
+ EncodingISOLatin1.CODE_POINTS,
+ EncodingISOLatin1.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -378,7 +378,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -546,7 +546,7 @@
0xfb04 // #164 glyph: 0x5a \132
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -716,8 +716,8 @@
public EncodingMacExpert() {
super("MacExpertEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingMacExpert.codePoints,
- EncodingMacExpert.codePointIndexes);
+ EncodingMacExpert.CODE_POINTS,
+ EncodingMacExpert.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -462,7 +462,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -672,7 +672,7 @@
0xfb02 // #206 glyph: 0xdf \337
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -884,8 +884,8 @@
public EncodingMacRoman() {
super("MacRomanEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingMacRoman.codePoints,
- EncodingMacRoman.codePointIndexes);
+ EncodingMacRoman.CODE_POINTS,
+ EncodingMacRoman.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -571,7 +571,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x0000, // [0] glyph: 0x0000 \0000
0x0000, // [1] glyph: 0x0000 \0000
0x0000, // [2] glyph: 0x0000 \0000
@@ -832,7 +832,7 @@
0xfb02 // [257] glyph: 0x00c1 \0301
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x0000, // [0]
0x0000, // [1]
0x0000, // [2]
@@ -1095,8 +1095,8 @@
public EncodingMacStandard() {
super(STANDARD_MACINTOSH_ORDERING, GlyphList.standardSourceGlyphLists(),
- EncodingMacStandard.codePoints,
- EncodingMacStandard.codePointIndexes);
+ EncodingMacStandard.CODE_POINTS,
+ EncodingMacStandard.CODE_POINT_INDEXES);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -506,7 +506,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -738,7 +738,7 @@
0xfb02 // #228 glyph: 0x94 \224
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -972,8 +972,8 @@
public EncodingPDFDoc() {
super("PDFDocEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingPDFDoc.codePoints,
- EncodingPDFDoc.codePointIndexes);
+ EncodingPDFDoc.CODE_POINTS,
+ EncodingPDFDoc.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -349,7 +349,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -501,7 +501,7 @@
0xfb02 // #148 glyph: 0xaf \257
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -655,8 +655,8 @@
public EncodingStandard() {
super("StandardEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingStandard.codePoints,
- EncodingStandard.codePointIndexes);
+ EncodingStandard.CODE_POINTS,
+ EncodingStandard.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -434,7 +434,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x23, // #2 glyph: 0x23 \43
@@ -626,7 +626,7 @@
0xf8fe // #188 glyph: 0xfe \376
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x23, // #2
@@ -820,8 +820,8 @@
public EncodingSymbol() {
super("SymbolEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingSymbol.codePoints,
- EncodingSymbol.codePointIndexes);
+ EncodingSymbol.CODE_POINTS,
+ EncodingSymbol.CODE_POINT_INDEXES);
}
public String predefinedPDFName() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -480,7 +480,7 @@
};
*/
- public static final char[] codePoints = {
+ public static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -699,7 +699,7 @@
0x2122 // #215 glyph: 0x99 \231
};
- public static final char[] codePointIndexes = {
+ public static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -920,8 +920,8 @@
public EncodingWinAnsi() {
super("WinAnsiEncoding", GlyphList.standardSourceGlyphLists(),
- EncodingWinAnsi.codePoints,
- EncodingWinAnsi.codePointIndexes);
+ EncodingWinAnsi.CODE_POINTS,
+ EncodingWinAnsi.CODE_POINT_INDEXES);
}
/**
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -47,7 +47,7 @@
*/
public class EncodingZapfDingbats extends EncodingVector {
- private static final GlyphList[] glyphListsUsed = {
+ private static final GlyphList[] GLYPH_LISTS_USED = {
GlyphList.getGlyphList("ZapfDingbats"),
/* We need the Adobe Glyph List to get the "space" char. */
GlyphList.getGlyphList("AGL")
@@ -465,7 +465,7 @@
};
*/
- private static final char[] codePoints = {
+ private static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x2192, // [1] glyph: 0x00d5 \0325
0x2194, // [2] glyph: 0x00d6 \0326
@@ -670,7 +670,7 @@
0x27be // [201] glyph: 0x00fe \0376
};
- private static final char[] codePointIndexes = {
+ private static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x00d5, // [1]
0x00d6, // [2]
@@ -876,9 +876,9 @@
};
public EncodingZapfDingbats() {
- super("ZapfDingbatsEncoding", glyphListsUsed,
- EncodingZapfDingbats.codePoints,
- EncodingZapfDingbats.codePointIndexes);
+ super("ZapfDingbatsEncoding", GLYPH_LISTS_USED,
+ EncodingZapfDingbats.CODE_POINTS,
+ EncodingZapfDingbats.CODE_POINT_INDEXES);
}
public String predefinedPDFName() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -43,7 +43,7 @@
* instance. */
private static HashMap glyphListMap = new HashMap();
- private static final GlyphList[] standardSourceGlyphLists = {
+ private static final GlyphList[] STANDARD_SOURCE_GLYPH_LISTS = {
GlyphList.getGlyphList("AGL")
};
@@ -253,7 +253,7 @@
* @return Returns the standardSourceGlyphLists.
*/
public static GlyphList[] standardSourceGlyphLists() {
- return standardSourceGlyphLists;
+ return STANDARD_SOURCE_GLYPH_LISTS;
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -61,7 +61,7 @@
public class GlyphListAGL extends GlyphList {
// Note: This array must be sorted alphabatically (used in binary search).
- public static final String[] agl = {
+ public static final String[] AGL = {
"A",
"AE",
"AEacute",
@@ -4346,8 +4346,8 @@
};
protected GlyphListAGL() {
- super("AGL", GlyphListAGL.agl, GlyphListAGL2.charForGlyph,
- GlyphListAGL3.charList, GlyphListAGL4.glyphNameIndex);
+ super("AGL", GlyphListAGL.AGL, GlyphListAGL2.CHAR_FOR_GLYPH,
+ GlyphListAGL3.CHAR_LIST, GlyphListAGL4.GLYPH_NAME_INDEX);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL2.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -36,7 +36,7 @@
* This array contains the Unicode code points that correspond to the glyph
* names that are found in GlyphList.agl.
*/
- public static final char[][] charForGlyph = {
+ public static final char[][] CHAR_FOR_GLYPH = {
{ 0x0041 },
{ 0x00C6 },
{ 0x01FC },
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL3.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -32,7 +32,7 @@
*/
public class GlyphListAGL3 {
- public static final char[] charList = {
+ public static final char[] CHAR_LIST = {
0x0001,
0x0002,
0x0003,
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListAGL4.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -32,7 +32,7 @@
*/
public class GlyphListAGL4 {
- public static final short[] glyphNameIndex = {
+ public static final short[] GLYPH_NAME_INDEX = {
1454,
1453,
1443,
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListZapfDingbats.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -35,7 +35,7 @@
public class GlyphListZapfDingbats extends GlyphList {
// Note: This array must be sorted alphabatically (used in binary search).
- public static final String[] glyphList = {
+ public static final String[] GLYPH_LIST = {
"a1",
"a10",
"a100",
@@ -239,7 +239,7 @@
"a99"
};
- public static final char[][] charForGlyph = {
+ public static final char[][] CHAR_FOR_GLYPH = {
{ 0x2701 },
{ 0x2721 },
{ 0x275e },
@@ -443,7 +443,7 @@
{ 0x275d }
};
- public static final char[] charList = {
+ public static final char[] CHAR_LIST = {
0x2192,
0x2194,
0x2195,
@@ -647,7 +647,7 @@
0x27be
};
- public static final short[] glyphNameIndex = {
+ public static final short[] GLYPH_NAME_INDEX = {
65,
67,
68,
@@ -852,10 +852,10 @@
};
protected GlyphListZapfDingbats() {
- super("ZapfDingbats", GlyphListZapfDingbats.glyphList,
- GlyphListZapfDingbats.charForGlyph,
- GlyphListZapfDingbats.charList,
- GlyphListZapfDingbats.glyphNameIndex);
+ super("ZapfDingbats", GlyphListZapfDingbats.GLYPH_LIST,
+ GlyphListZapfDingbats.CHAR_FOR_GLYPH,
+ GlyphListZapfDingbats.CHAR_LIST,
+ GlyphListZapfDingbats.GLYPH_NAME_INDEX);
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -34,7 +34,7 @@
private static final char ASCII85_START = '!';
private static final byte[] ASCII85_EOD = { 0x7E, 0x3E }; // "~>"
- private static final long base85_4 = 85;
+ private static final long BASE_85_4 = 85;
public String getName() {
return "/ASCII85Decode";
@@ -123,15 +123,15 @@
final byte[] result = { (byte)ASCII85_ZERO };
return result;
}
- final byte c5 = (byte)((word % base85_4) + ASCII85_START);
- word = word / base85_4;
- final byte c4 = (byte)((word % base85_4) + ASCII85_START);
- word = word / base85_4;
- final byte c3 = (byte)((word % base85_4) + ASCII85_START);
- word = word / base85_4;
- final byte c2 = (byte)((word % base85_4) + ASCII85_START);
- word = word / base85_4;
- final byte c1 = (byte)((word % base85_4) + ASCII85_START);
+ final byte c5 = (byte)((word % BASE_85_4) + ASCII85_START);
+ word = word / BASE_85_4;
+ final byte c4 = (byte)((word % BASE_85_4) + ASCII85_START);
+ word = word / BASE_85_4;
+ final byte c3 = (byte)((word % BASE_85_4) + ASCII85_START);
+ word = word / BASE_85_4;
+ final byte c2 = (byte)((word % BASE_85_4) + ASCII85_START);
+ word = word / BASE_85_4;
+ final byte c1 = (byte)((word % BASE_85_4) + ASCII85_START);
final byte[] ret = { c1 , c2, c3, c4, c5 };
for (int i = 0; i < ret.length; i++) {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -34,18 +34,18 @@
*/
public class CCITTFaxFilter extends PSFilter {
- private String m_decodeParms;
+ private String decodeParms;
public String getName() {
return "/CCITTFaxDecode";
}
public String getDecodeParms() {
- return this.m_decodeParms;
+ return this.decodeParms;
}
public void setDecodeParms(final String decodeParms) {
- this.m_decodeParms = decodeParms;
+ this.decodeParms = decodeParms;
}
public byte[] encode(final byte[] data) {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -47,28 +47,28 @@
public static final int PREDICTION_PNG_OPT = 15;
- private int _predictor = PREDICTION_NONE;
- private int _colors;
- private int _bitsPerComponent;
- private int _columns;
+ private int predictor = PREDICTION_NONE;
+ private int colors;
+ private int bitsPerComponent;
+ private int columns;
public String getName() {
return "/FlateDecode";
}
public String getDecodeParms() {
- if (_predictor > PREDICTION_NONE) {
+ if (this.predictor > PREDICTION_NONE) {
final StringBuffer sb = new StringBuffer();
sb.append("<< /Predictor ");
- sb.append(_predictor);
- if (_colors > 0) {
- sb.append(" /Colors " + _colors);
+ sb.append(this.predictor);
+ if (colors > 0) {
+ sb.append(" /Colors " + colors);
}
- if (_bitsPerComponent > 0) {
- sb.append(" /BitsPerComponent " + _bitsPerComponent);
+ if (bitsPerComponent > 0) {
+ sb.append(" /BitsPerComponent " + bitsPerComponent);
}
- if (_columns > 0) {
- sb.append(" /Columns " + _columns);
+ if (this.columns > 0) {
+ sb.append(" /Columns " + this.columns);
}
sb.append(" >> ");
return sb.toString();
@@ -86,7 +86,7 @@
public byte[] encode(final byte[] data) throws PSFilterException {
final ByteArrayOutputStream outArrayStream =
new ByteArrayOutputStream();
- _predictor = PREDICTION_NONE;
+ this.predictor = PREDICTION_NONE;
try {
final DeflaterOutputStream compressedStream =
new DeflaterOutputStream(outArrayStream);
@@ -107,18 +107,18 @@
}
public void setPredictor(final int predictor) throws PSFilterException {
- _predictor = predictor;
+ this.predictor = predictor;
}
public int getPredictor() {
- return _predictor;
+ return this.predictor;
}
public void setColors(final int colors) throws PSFilterException {
- if (_predictor != PREDICTION_NONE) {
- _colors = colors;
+ if (predictor != PREDICTION_NONE) {
+ this.colors = colors;
} else {
throw new PSFilterException("Prediction must not be "
+ "PREDICTION_NONE in order to set Colors");
@@ -126,13 +126,13 @@
}
public int getColors() {
- return _colors;
+ return this.colors;
}
public void setBitsPerComponent(final int bits) throws PSFilterException {
- if (_predictor != PREDICTION_NONE) {
- _bitsPerComponent = bits;
+ if (predictor != PREDICTION_NONE) {
+ bitsPerComponent = bits;
} else {
throw new PSFilterException("Prediction must not be "
+ "PREDICTION_NONE in order to set bitsPerComponent");
@@ -140,13 +140,13 @@
}
public int getBitsPerComponent() {
- return _bitsPerComponent;
+ return bitsPerComponent;
}
public void setColumns(final int columns) throws PSFilterException {
- if (_predictor != PREDICTION_NONE) {
- _columns = columns;
+ if (predictor != PREDICTION_NONE) {
+ this.columns = columns;
} else {
throw new PSFilterException("Prediction must not be "
+ "PREDICTION_NONE in order to set Columns");
@@ -154,7 +154,7 @@
}
public int getColumns() {
- return _columns;
+ return this.columns;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java 2006-09-07 19:01:57 UTC (rev 7940)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java 2006-09-07 19:24:21 UTC (rev 7941)
@@ -41,10 +41,10 @@
/**
* Marker to know if this filter has already been applied to the data
*/
- private boolean _applied = false;
+ private boolean applied = false;
public boolean isApplied() {
- return _applied;
+ return applied;
}
/**
@@ -57,7 +57,7 @@
* those which the raw data was encoded with.
*/
public void setApplied(final boolean b) {
- _applied = b;
+ applied = b;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
