You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/05/07 18:23:17 UTC
svn commit: r1479969 [11/16] - in /xmlgraphics/fop/trunk: ./
src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/codegen/unicode/java/org/apache/fop/hyphenation/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/
src/java/org/...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java Tue May 7 16:23:13 2013
@@ -115,7 +115,7 @@ public class NumberConverter {
* @param country (may be null or empty, which is treated as null)
* @throws IllegalArgumentException if format is not a valid UTF-16 string (e.g., has unpaired surrogate)
*/
- public NumberConverter (String format, int groupingSeparator, int groupingSize, int letterValue, String features, String language, String country)
+ public NumberConverter(String format, int groupingSeparator, int groupingSize, int letterValue, String features, String language, String country)
throws IllegalArgumentException {
this.groupingSeparator = groupingSeparator;
this.groupingSize = groupingSize;
@@ -123,7 +123,7 @@ public class NumberConverter {
this.features = features;
this.language = (language != null) ? language.toLowerCase() : null;
this.country = (country != null) ? country.toLowerCase() : null;
- parseFormatTokens (format);
+ parseFormatTokens(format);
}
/**
@@ -131,10 +131,10 @@ public class NumberConverter {
* @param number number to conver
* @return string representing converted number
*/
- public String convert (long number) {
+ public String convert(long number) {
List<Long> numbers = new ArrayList<Long>();
- numbers.add (number);
- return convert (numbers);
+ numbers.add(number);
+ return convert(numbers);
}
/**
@@ -142,19 +142,19 @@ public class NumberConverter {
* @param numbers list of numbers to convert
* @return string representing converted list of numbers
*/
- public String convert (List<Long> numbers) {
+ public String convert(List<Long> numbers) {
List<Integer> scalars = new ArrayList<Integer>();
if (prefix != null) {
- appendScalars (scalars, prefix);
+ appendScalars(scalars, prefix);
}
- convertNumbers (scalars, numbers);
+ convertNumbers(scalars, numbers);
if (suffix != null) {
- appendScalars (scalars, suffix);
+ appendScalars(scalars, suffix);
}
- return scalarsToString (scalars);
+ return scalarsToString(scalars);
}
- private void parseFormatTokens (String format) throws IllegalArgumentException {
+ private void parseFormatTokens(String format) throws IllegalArgumentException {
List<Integer[]> tokens = new ArrayList<Integer[]>();
List<Integer[]> separators = new ArrayList<Integer[]>();
if ((format == null) || (format.length() == 0)) {
@@ -162,42 +162,42 @@ public class NumberConverter {
}
int tokenType = TOKEN_NONE;
List<Integer> token = new ArrayList<Integer>();
- Integer[] ca = UTF32.toUTF32 (format, 0, true);
+ Integer[] ca = UTF32.toUTF32(format, 0, true);
for (int i = 0, n = ca.length; i < n; i++) {
int c = ca[i];
- int tokenTypeNew = isAlphaNumeric (c) ? TOKEN_ALPHANUMERIC : TOKEN_NONALPHANUMERIC;
+ int tokenTypeNew = isAlphaNumeric(c) ? TOKEN_ALPHANUMERIC : TOKEN_NONALPHANUMERIC;
if (tokenTypeNew != tokenType) {
if (token.size() > 0) {
if (tokenType == TOKEN_ALPHANUMERIC) {
- tokens.add (token.toArray (new Integer [ token.size() ]));
+ tokens.add(token.toArray(new Integer [ token.size() ]));
} else {
- separators.add (token.toArray (new Integer [ token.size() ]));
+ separators.add(token.toArray(new Integer [ token.size() ]));
}
token.clear();
}
tokenType = tokenTypeNew;
}
- token.add (c);
+ token.add(c);
}
if (token.size() > 0) {
if (tokenType == TOKEN_ALPHANUMERIC) {
- tokens.add (token.toArray (new Integer [ token.size() ]));
+ tokens.add(token.toArray(new Integer [ token.size() ]));
} else {
- separators.add (token.toArray (new Integer [ token.size() ]));
+ separators.add(token.toArray(new Integer [ token.size() ]));
}
}
if (! separators.isEmpty()) {
- this.prefix = separators.remove (0);
+ this.prefix = separators.remove(0);
}
if (! separators.isEmpty()) {
- this.suffix = separators.remove (separators.size() - 1);
+ this.suffix = separators.remove(separators.size() - 1);
}
- this.separators = separators.toArray (new Integer [ separators.size() ] []);
- this.tokens = tokens.toArray (new Integer [ tokens.size() ] []);
+ this.separators = separators.toArray(new Integer [ separators.size() ] []);
+ this.tokens = tokens.toArray(new Integer [ tokens.size() ] []);
}
- private static boolean isAlphaNumeric (int c) {
- switch (Character.getType (c)) {
+ private static boolean isAlphaNumeric(int c) {
+ switch (Character.getType(c)) {
case Character.DECIMAL_DIGIT_NUMBER: // Nd
case Character.LETTER_NUMBER: // Nl
case Character.OTHER_NUMBER: // No
@@ -212,7 +212,7 @@ public class NumberConverter {
}
}
- private void convertNumbers (List<Integer> scalars, List<Long> numbers) {
+ private void convertNumbers(List<Integer> scalars, List<Long> numbers) {
Integer[] tknLast = DEFAULT_TOKEN;
int tknIndex = 0;
int tknCount = tokens.length;
@@ -234,40 +234,40 @@ public class NumberConverter {
} else {
tkn = tknLast;
}
- appendScalars (scalars, convertNumber (number, sep, tkn));
+ appendScalars(scalars, convertNumber(number, sep, tkn));
tknLast = tkn;
numIndex++;
}
}
- private Integer[] convertNumber (long number, Integer[] separator, Integer[] token) {
+ private Integer[] convertNumber(long number, Integer[] separator, Integer[] token) {
List<Integer> sl = new ArrayList<Integer>();
if (separator != null) {
- appendScalars (sl, separator);
+ appendScalars(sl, separator);
}
if (token != null) {
- appendScalars (sl, formatNumber (number, token));
+ appendScalars(sl, formatNumber(number, token));
}
- return sl.toArray (new Integer [ sl.size() ]);
+ return sl.toArray(new Integer [ sl.size() ]);
}
- private Integer[] formatNumber (long number, Integer[] token) {
+ private Integer[] formatNumber(long number, Integer[] token) {
Integer[] fn = null;
assert token.length > 0;
if (number < 0) {
- throw new IllegalArgumentException ("number must be non-negative");
+ throw new IllegalArgumentException("number must be non-negative");
} else if (token.length == 1) {
int s = token[0].intValue();
switch (s) {
case (int) '1':
{
- fn = formatNumberAsDecimal (number, (int) '1', 1);
+ fn = formatNumberAsDecimal(number, (int) '1', 1);
break;
}
case (int) 'W':
case (int) 'w':
{
- fn = formatNumberAsWord (number, (s == (int) 'W') ? Character.UPPERCASE_LETTER : Character.LOWERCASE_LETTER);
+ fn = formatNumberAsWord(number, (s == (int) 'W') ? Character.UPPERCASE_LETTER : Character.LOWERCASE_LETTER);
break;
}
case (int) 'A': // handled as numeric sequence
@@ -276,12 +276,12 @@ public class NumberConverter {
case (int) 'i': // handled as numeric special
default:
{
- if (isStartOfDecimalSequence (s)) {
- fn = formatNumberAsDecimal (number, s, 1);
- } else if (isStartOfAlphabeticSequence (s)) {
- fn = formatNumberAsSequence (number, s, getSequenceBase (s), null);
- } else if (isStartOfNumericSpecial (s)) {
- fn = formatNumberAsSpecial (number, s);
+ if (isStartOfDecimalSequence(s)) {
+ fn = formatNumberAsDecimal(number, s, 1);
+ } else if (isStartOfAlphabeticSequence(s)) {
+ fn = formatNumberAsSequence(number, s, getSequenceBase(s), null);
+ } else if (isStartOfNumericSpecial(s)) {
+ fn = formatNumberAsSpecial(number, s);
} else {
fn = null;
}
@@ -289,15 +289,15 @@ public class NumberConverter {
}
}
} else if ((token.length == 2) && (token[0] == (int) 'W') && (token[1] == (int) 'w')) {
- fn = formatNumberAsWord (number, Character.TITLECASE_LETTER);
- } else if (isPaddedOne (token)) {
+ fn = formatNumberAsWord(number, Character.TITLECASE_LETTER);
+ } else if (isPaddedOne(token)) {
int s = token [ token.length - 1 ].intValue();
- fn = formatNumberAsDecimal (number, s, token.length);
+ fn = formatNumberAsDecimal(number, s, token.length);
} else {
- throw new IllegalArgumentException ("invalid format token: \"" + UTF32.fromUTF32 (token) + "\"");
+ throw new IllegalArgumentException("invalid format token: \"" + UTF32.fromUTF32(token) + "\"");
}
if (fn == null) {
- fn = formatNumber (number, DEFAULT_TOKEN);
+ fn = formatNumber(number, DEFAULT_TOKEN);
}
assert fn != null;
return fn;
@@ -311,27 +311,27 @@ public class NumberConverter {
* @param width non-negative integer denoting field width of number, possible including padding
* @return formatted number as array of unicode scalars
*/
- private Integer[] formatNumberAsDecimal (long number, int one, int width) {
- assert Character.getNumericValue (one) == 1;
- assert Character.getNumericValue (one - 1) == 0;
- assert Character.getNumericValue (one + 8) == 9;
+ private Integer[] formatNumberAsDecimal(long number, int one, int width) {
+ assert Character.getNumericValue(one) == 1;
+ assert Character.getNumericValue(one - 1) == 0;
+ assert Character.getNumericValue(one + 8) == 9;
List<Integer> sl = new ArrayList<Integer>();
int zero = one - 1;
while (number > 0) {
long digit = number % 10;
- sl.add (0, zero + (int) digit);
+ sl.add(0, zero + (int) digit);
number = number / 10;
}
while (width > sl.size()) {
- sl.add (0, zero);
+ sl.add(0, zero);
}
if ((groupingSize != 0) && (groupingSeparator != 0)) {
- sl = performGrouping (sl, groupingSize, groupingSeparator);
+ sl = performGrouping(sl, groupingSize, groupingSeparator);
}
- return sl.toArray (new Integer [ sl.size() ]);
+ return sl.toArray(new Integer [ sl.size() ]);
}
- private static List<Integer> performGrouping (List<Integer> sl, int groupingSize, int groupingSeparator) {
+ private static List<Integer> performGrouping(List<Integer> sl, int groupingSize, int groupingSeparator) {
assert groupingSize > 0;
assert groupingSeparator != 0;
if (sl.size() > groupingSize) {
@@ -339,12 +339,12 @@ public class NumberConverter {
for (int i = 0, n = sl.size(), g = 0; i < n; i++) {
int k = n - i - 1;
if (g == groupingSize) {
- gl.add (0, groupingSeparator);
+ gl.add(0, groupingSeparator);
g = 1;
} else {
g++;
}
- gl.add (0, sl.get (k));
+ gl.add(0, sl.get(k));
}
return gl;
} else {
@@ -362,7 +362,7 @@ public class NumberConverter {
* @param map if non-null, then maps sequences indices to unicode scalars
* @return formatted number as array of unicode scalars
*/
- private Integer[] formatNumberAsSequence (long number, int one, int base, int[] map) {
+ private Integer[] formatNumberAsSequence(long number, int one, int base, int[] map) {
assert base > 1;
assert (map == null) || (map.length >= base);
List<Integer> sl = new ArrayList<Integer>();
@@ -373,10 +373,10 @@ public class NumberConverter {
while (n > 0) {
int d = (int) ((n - 1) % (long) base);
int s = (map != null) ? map [ d ] : (one + d);
- sl.add (0, s);
+ sl.add(0, s);
n = (n - 1) / base;
}
- return sl.toArray (new Integer [ sl.size() ]);
+ return sl.toArray(new Integer [ sl.size() ]);
}
}
@@ -386,10 +386,10 @@ public class NumberConverter {
* @param one unicode scalar value denoting start of system (numeric value 1)
* @return formatted number as array of unicode scalars
*/
- private Integer[] formatNumberAsSpecial (long number, int one) {
- SpecialNumberFormatter f = getSpecialFormatter (one, letterValue, features, language, country);
+ private Integer[] formatNumberAsSpecial(long number, int one) {
+ SpecialNumberFormatter f = getSpecialFormatter(one, letterValue, features, language, country);
if (f != null) {
- return f.format (number, one, letterValue, features, language, country);
+ return f.format(number, one, letterValue, features, language, country);
} else {
return null;
}
@@ -404,27 +404,27 @@ public class NumberConverter {
* @param caseType unicode character type for case conversion
* @return formatted number as array of unicode scalars
*/
- private Integer[] formatNumberAsWord (long number, int caseType) {
+ private Integer[] formatNumberAsWord(long number, int caseType) {
SpecialNumberFormatter f = null;
- if (isLanguage ("eng")) {
- f = new EnglishNumberAsWordFormatter (caseType);
- } else if (isLanguage ("spa")) {
- f = new SpanishNumberAsWordFormatter (caseType);
- } else if (isLanguage ("fra")) {
- f = new FrenchNumberAsWordFormatter (caseType);
+ if (isLanguage("eng")) {
+ f = new EnglishNumberAsWordFormatter(caseType);
+ } else if (isLanguage("spa")) {
+ f = new SpanishNumberAsWordFormatter(caseType);
+ } else if (isLanguage("fra")) {
+ f = new FrenchNumberAsWordFormatter(caseType);
} else {
- f = new EnglishNumberAsWordFormatter (caseType);
+ f = new EnglishNumberAsWordFormatter(caseType);
}
- return f.format (number, 0, letterValue, features, language, country);
+ return f.format(number, 0, letterValue, features, language, country);
}
- private boolean isLanguage (String iso3Code) {
+ private boolean isLanguage(String iso3Code) {
if (language == null) {
return false;
- } else if (language.equals (iso3Code)) {
+ } else if (language.equals(iso3Code)) {
return true;
} else {
- return isSameLanguage (iso3Code, language);
+ return isSameLanguage(iso3Code, language);
}
}
@@ -434,12 +434,12 @@ public class NumberConverter {
{ "spa", "es" },
};
- private static boolean isSameLanguage (String i3c, String lc) {
+ private static boolean isSameLanguage(String i3c, String lc) {
for (String[] el : equivalentLanguages) {
assert el.length >= 2;
- if (el[0].equals (i3c)) {
+ if (el[0].equals(i3c)) {
for (int i = 0, n = el.length; i < n; i++) {
- if (el[i].equals (lc)) {
+ if (el[i].equals(lc)) {
return true;
}
}
@@ -449,7 +449,7 @@ public class NumberConverter {
return false;
}
- private static boolean hasFeature (String features, String feature) {
+ private static boolean hasFeature(String features, String feature) {
if (features != null) {
assert feature != null;
assert feature.length() != 0;
@@ -459,7 +459,7 @@ public class NumberConverter {
assert fp.length > 0;
String fn = fp[0];
String fv = (fp.length > 1) ? fp[1] : "";
- if (fn.equals (feature)) {
+ if (fn.equals(feature)) {
return true;
}
}
@@ -487,23 +487,23 @@ public class NumberConverter {
}
*/
- private static void appendScalars (List<Integer> scalars, Integer[] sa) {
+ private static void appendScalars(List<Integer> scalars, Integer[] sa) {
for (Integer s : sa) {
- scalars.add (s);
+ scalars.add(s);
}
}
- private static String scalarsToString (List<Integer> scalars) {
- Integer[] sa = scalars.toArray (new Integer [ scalars.size() ]);
- return UTF32.fromUTF32 (sa);
+ private static String scalarsToString(List<Integer> scalars) {
+ Integer[] sa = scalars.toArray(new Integer [ scalars.size() ]);
+ return UTF32.fromUTF32(sa);
}
- private static boolean isPaddedOne (Integer[] token) {
- if (getDecimalValue (token [ token.length - 1 ]) != 1) {
+ private static boolean isPaddedOne(Integer[] token) {
+ if (getDecimalValue(token [ token.length - 1 ]) != 1) {
return false;
} else {
for (int i = 0, n = token.length - 1; i < n; i++) {
- if (getDecimalValue (token [ i ]) != 0) {
+ if (getDecimalValue(token [ i ]) != 0) {
return false;
}
}
@@ -511,19 +511,19 @@ public class NumberConverter {
}
}
- private static int getDecimalValue (Integer scalar) {
+ private static int getDecimalValue(Integer scalar) {
int s = scalar.intValue();
- if (Character.getType (s) == Character.DECIMAL_DIGIT_NUMBER) {
- return Character.getNumericValue (s);
+ if (Character.getType(s) == Character.DECIMAL_DIGIT_NUMBER) {
+ return Character.getNumericValue(s);
} else {
return -1;
}
}
- private static boolean isStartOfDecimalSequence (int s) {
- return (Character.getNumericValue (s) == 1)
- && (Character.getNumericValue (s - 1) == 0)
- && (Character.getNumericValue (s + 8) == 9);
+ private static boolean isStartOfDecimalSequence(int s) {
+ return (Character.getNumericValue(s) == 1)
+ && (Character.getNumericValue(s - 1) == 0)
+ && (Character.getNumericValue(s + 8) == 9);
}
private static int[][] supportedAlphabeticSequences = {
@@ -531,7 +531,7 @@ public class NumberConverter {
{ 'a', 26 }, // a...z
};
- private static boolean isStartOfAlphabeticSequence (int s) {
+ private static boolean isStartOfAlphabeticSequence(int s) {
for (int[] ss : supportedAlphabeticSequences) {
assert ss.length >= 2;
if (ss[0] == s) {
@@ -541,7 +541,7 @@ public class NumberConverter {
return false;
}
- private static int getSequenceBase (int s) {
+ private static int getSequenceBase(int s) {
for (int[] ss : supportedAlphabeticSequences) {
assert ss.length >= 2;
if (ss[0] == s) {
@@ -566,7 +566,7 @@ public class NumberConverter {
{ '\u30A4' }, // kana - katakana (iroha)
};
- private static boolean isStartOfNumericSpecial (int s) {
+ private static boolean isStartOfNumericSpecial(int s) {
for (int[] ss : supportedSpecials) {
assert ss.length >= 1;
if (ss[0] == s) {
@@ -576,7 +576,7 @@ public class NumberConverter {
return false;
}
- private SpecialNumberFormatter getSpecialFormatter (int one, int letterValue, String features, String language, String country) {
+ private SpecialNumberFormatter getSpecialFormatter(int one, int letterValue, String features, String language, String country) {
if (one == (int) 'I') {
return new RomanNumeralsFormatter();
} else if (one == (int) 'i') {
@@ -606,20 +606,20 @@ public class NumberConverter {
}
}
- private static Integer[] toUpperCase (Integer[] sa) {
+ private static Integer[] toUpperCase(Integer[] sa) {
assert sa != null;
for (int i = 0, n = sa.length; i < n; i++) {
Integer s = sa [ i ];
- sa [ i ] = Character.toUpperCase (s);
+ sa [ i ] = Character.toUpperCase(s);
}
return sa;
}
- private static Integer[] toLowerCase (Integer[] sa) {
+ private static Integer[] toLowerCase(Integer[] sa) {
assert sa != null;
for (int i = 0, n = sa.length; i < n; i++) {
Integer s = sa [ i ];
- sa [ i ] = Character.toLowerCase (s);
+ sa [ i ] = Character.toLowerCase(s);
}
return sa;
}
@@ -634,15 +634,15 @@ public class NumberConverter {
}
*/
- private static List<String> convertWordCase (List<String> words, int caseType) {
+ private static List<String> convertWordCase(List<String> words, int caseType) {
List<String> wl = new ArrayList<String>();
for (String w : words) {
- wl.add (convertWordCase (w, caseType));
+ wl.add(convertWordCase(w, caseType));
}
return wl;
}
- private static String convertWordCase (String word, int caseType) {
+ private static String convertWordCase(String word, int caseType) {
if (caseType == Character.UPPERCASE_LETTER) {
return word.toUpperCase();
} else if (caseType == Character.LOWERCASE_LETTER) {
@@ -650,11 +650,11 @@ public class NumberConverter {
} else if (caseType == Character.TITLECASE_LETTER) {
StringBuffer sb = new StringBuffer();
for (int i = 0, n = word.length(); i < n; i++) {
- String s = word.substring (i, i + 1);
+ String s = word.substring(i, i + 1);
if (i == 0) {
- sb.append (s.toUpperCase());
+ sb.append(s.toUpperCase());
} else {
- sb.append (s.toLowerCase());
+ sb.append(s.toLowerCase());
}
}
return sb.toString();
@@ -663,13 +663,13 @@ public class NumberConverter {
}
}
- private static String joinWords (List<String> words, String separator) {
+ private static String joinWords(List<String> words, String separator) {
StringBuffer sb = new StringBuffer();
for (String w : words) {
if (sb.length() > 0) {
- sb.append (separator);
+ sb.append(separator);
}
- sb.append (w);
+ sb.append(w);
}
return sb.toString();
}
@@ -688,7 +688,7 @@ public class NumberConverter {
* @param country denotes applicable country
* @return formatted number as array of unicode scalars
*/
- Integer[] format (long number, int one, int letterValue, String features, String language, String country);
+ Integer[] format(long number, int one, int letterValue, String features, String language, String country);
}
/**
@@ -704,98 +704,98 @@ public class NumberConverter {
private static String[] englishWordOthersOrd = { "hundredth", "thousandth", "millionth", "billionth" };
private static class EnglishNumberAsWordFormatter implements SpecialNumberFormatter {
private int caseType = Character.UPPERCASE_LETTER;
- EnglishNumberAsWordFormatter (int caseType) {
+ EnglishNumberAsWordFormatter(int caseType) {
this.caseType = caseType;
}
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
List<String> wl = new ArrayList<String>();
if (number >= 1000000000000L) {
return null;
} else {
- boolean ordinal = hasFeature (features, "ordinal");
+ boolean ordinal = hasFeature(features, "ordinal");
if (number == 0) {
- wl.add (englishWordOnes [ 0 ]);
+ wl.add(englishWordOnes [ 0 ]);
} else if (ordinal && (number < 10)) {
- wl.add (englishWordOnesOrd [ (int) number ]);
+ wl.add(englishWordOnesOrd [ (int) number ]);
} else {
int ones = (int) (number % 1000);
int thousands = (int) ((number / 1000) % 1000);
int millions = (int) ((number / 1000000) % 1000);
int billions = (int) ((number / 1000000000) % 1000);
if (billions > 0) {
- wl = formatOnesInThousand (wl, billions);
+ wl = formatOnesInThousand(wl, billions);
if (ordinal && ((number % 1000000000) == 0)) {
- wl.add (englishWordOthersOrd[3]);
+ wl.add(englishWordOthersOrd[3]);
} else {
- wl.add (englishWordOthers[3]);
+ wl.add(englishWordOthers[3]);
}
}
if (millions > 0) {
- wl = formatOnesInThousand (wl, millions);
+ wl = formatOnesInThousand(wl, millions);
if (ordinal && ((number % 1000000) == 0)) {
- wl.add (englishWordOthersOrd[2]);
+ wl.add(englishWordOthersOrd[2]);
} else {
- wl.add (englishWordOthers[2]);
+ wl.add(englishWordOthers[2]);
}
}
if (thousands > 0) {
- wl = formatOnesInThousand (wl, thousands);
+ wl = formatOnesInThousand(wl, thousands);
if (ordinal && ((number % 1000) == 0)) {
- wl.add (englishWordOthersOrd[1]);
+ wl.add(englishWordOthersOrd[1]);
} else {
- wl.add (englishWordOthers[1]);
+ wl.add(englishWordOthers[1]);
}
}
if (ones > 0) {
- wl = formatOnesInThousand (wl, ones, ordinal);
+ wl = formatOnesInThousand(wl, ones, ordinal);
}
}
- wl = convertWordCase (wl, caseType);
- return UTF32.toUTF32 (joinWords (wl, " "), 0, true);
+ wl = convertWordCase(wl, caseType);
+ return UTF32.toUTF32(joinWords(wl, " "), 0, true);
}
}
- private List<String> formatOnesInThousand (List<String> wl, int number) {
- return formatOnesInThousand (wl, number, false);
+ private List<String> formatOnesInThousand(List<String> wl, int number) {
+ return formatOnesInThousand(wl, number, false);
}
- private List<String> formatOnesInThousand (List<String> wl, int number, boolean ordinal) {
+ private List<String> formatOnesInThousand(List<String> wl, int number, boolean ordinal) {
assert number < 1000;
int ones = number % 10;
int tens = (number / 10) % 10;
int hundreds = (number / 100) % 10;
if (hundreds > 0) {
- wl.add (englishWordOnes [ hundreds ]);
+ wl.add(englishWordOnes [ hundreds ]);
if (ordinal && ((number % 100) == 0)) {
- wl.add (englishWordOthersOrd[0]);
+ wl.add(englishWordOthersOrd[0]);
} else {
- wl.add (englishWordOthers[0]);
+ wl.add(englishWordOthers[0]);
}
}
if (tens > 0) {
if (tens == 1) {
if (ordinal) {
- wl.add (englishWordTeensOrd [ ones ]);
+ wl.add(englishWordTeensOrd [ ones ]);
} else {
- wl.add (englishWordTeens [ ones ]);
+ wl.add(englishWordTeens [ ones ]);
}
} else {
if (ordinal && (ones == 0)) {
- wl.add (englishWordTensOrd [ tens ]);
+ wl.add(englishWordTensOrd [ tens ]);
} else {
- wl.add (englishWordTens [ tens ]);
+ wl.add(englishWordTens [ tens ]);
}
if (ones > 0) {
if (ordinal) {
- wl.add (englishWordOnesOrd [ ones ]);
+ wl.add(englishWordOnesOrd [ ones ]);
} else {
- wl.add (englishWordOnes [ ones ]);
+ wl.add(englishWordOnes [ ones ]);
}
}
}
} else if (ones > 0) {
if (ordinal) {
- wl.add (englishWordOnesOrd [ ones ]);
+ wl.add(englishWordOnesOrd [ ones ]);
} else {
- wl.add (englishWordOnes [ ones ]);
+ wl.add(englishWordOnes [ ones ]);
}
}
return wl;
@@ -813,23 +813,23 @@ public class NumberConverter {
private static String[] frenchWordOnesOrdFemale = { "premi\u00e8re", "deuxi\u00e8me", "troisi\u00e8me", "quatri\u00e8me", "cinqui\u00e8me", "sixi\u00e8me", "septi\u00e8me", "huiti\u00e8me", "neuvi\u00e8me", "dixi\u00e8me" };
private static class FrenchNumberAsWordFormatter implements SpecialNumberFormatter {
private int caseType = Character.UPPERCASE_LETTER;
- FrenchNumberAsWordFormatter (int caseType) {
+ FrenchNumberAsWordFormatter(int caseType) {
this.caseType = caseType;
}
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
List<String> wl = new ArrayList<String>();
if (number >= 1000000000000L) {
return null;
} else {
- boolean ordinal = hasFeature (features, "ordinal");
+ boolean ordinal = hasFeature(features, "ordinal");
if (number == 0) {
- wl.add (frenchWordOnes [ 0 ]);
+ wl.add(frenchWordOnes [ 0 ]);
} else if (ordinal && (number <= 10)) {
- boolean female = hasFeature (features, "female");
+ boolean female = hasFeature(features, "female");
if (female) {
- wl.add (frenchWordOnesOrdFemale [ (int) number ]);
+ wl.add(frenchWordOnesOrdFemale [ (int) number ]);
} else {
- wl.add (frenchWordOnesOrdMale [ (int) number ]);
+ wl.add(frenchWordOnesOrdMale [ (int) number ]);
}
} else {
int ones = (int) (number % 1000);
@@ -837,98 +837,98 @@ public class NumberConverter {
int millions = (int) ((number / 1000000) % 1000);
int billions = (int) ((number / 1000000000) % 1000);
if (billions > 0) {
- wl = formatOnesInThousand (wl, billions);
+ wl = formatOnesInThousand(wl, billions);
if (billions == 1) {
- wl.add (frenchWordOthers[5]);
+ wl.add(frenchWordOthers[5]);
} else {
- wl.add (frenchWordOthers[6]);
+ wl.add(frenchWordOthers[6]);
}
}
if (millions > 0) {
- wl = formatOnesInThousand (wl, millions);
+ wl = formatOnesInThousand(wl, millions);
if (millions == 1) {
- wl.add (frenchWordOthers[3]);
+ wl.add(frenchWordOthers[3]);
} else {
- wl.add (frenchWordOthers[4]);
+ wl.add(frenchWordOthers[4]);
}
}
if (thousands > 0) {
if (thousands > 1) {
- wl = formatOnesInThousand (wl, thousands);
+ wl = formatOnesInThousand(wl, thousands);
}
- wl.add (frenchWordOthers[2]);
+ wl.add(frenchWordOthers[2]);
}
if (ones > 0) {
- wl = formatOnesInThousand (wl, ones);
+ wl = formatOnesInThousand(wl, ones);
}
}
- wl = convertWordCase (wl, caseType);
- return UTF32.toUTF32 (joinWords (wl, " "), 0, true);
+ wl = convertWordCase(wl, caseType);
+ return UTF32.toUTF32(joinWords(wl, " "), 0, true);
}
}
- private List<String> formatOnesInThousand (List<String> wl, int number) {
+ private List<String> formatOnesInThousand(List<String> wl, int number) {
assert number < 1000;
int ones = number % 10;
int tens = (number / 10) % 10;
int hundreds = (number / 100) % 10;
if (hundreds > 0) {
if (hundreds > 1) {
- wl.add (frenchWordOnes [ hundreds ]);
+ wl.add(frenchWordOnes [ hundreds ]);
}
if ((hundreds > 1) && (tens == 0) && (ones == 0)) {
- wl.add (frenchWordOthers[1]);
+ wl.add(frenchWordOthers[1]);
} else {
- wl.add (frenchWordOthers[0]);
+ wl.add(frenchWordOthers[0]);
}
}
if (tens > 0) {
if (tens == 1) {
- wl.add (frenchWordTeens [ ones ]);
+ wl.add(frenchWordTeens [ ones ]);
} else if (tens < 7) {
if (ones == 1) {
- wl.add (frenchWordTens [ tens ]);
- wl.add ("et");
- wl.add (frenchWordOnes [ ones ]);
+ wl.add(frenchWordTens [ tens ]);
+ wl.add("et");
+ wl.add(frenchWordOnes [ ones ]);
} else {
StringBuffer sb = new StringBuffer();
- sb.append (frenchWordTens [ tens ]);
+ sb.append(frenchWordTens [ tens ]);
if (ones > 0) {
- sb.append ('-');
- sb.append (frenchWordOnes [ ones ]);
+ sb.append('-');
+ sb.append(frenchWordOnes [ ones ]);
}
- wl.add (sb.toString());
+ wl.add(sb.toString());
}
} else if (tens == 7) {
if (ones == 1) {
- wl.add (frenchWordTens [ 6 ]);
- wl.add ("et");
- wl.add (frenchWordTeens [ ones ]);
+ wl.add(frenchWordTens [ 6 ]);
+ wl.add("et");
+ wl.add(frenchWordTeens [ ones ]);
} else {
StringBuffer sb = new StringBuffer();
- sb.append (frenchWordTens [ 6 ]);
- sb.append ('-');
- sb.append (frenchWordTeens [ ones ]);
- wl.add (sb.toString());
+ sb.append(frenchWordTens [ 6 ]);
+ sb.append('-');
+ sb.append(frenchWordTeens [ ones ]);
+ wl.add(sb.toString());
}
} else if (tens == 8) {
StringBuffer sb = new StringBuffer();
- sb.append (frenchWordTens [ tens ]);
+ sb.append(frenchWordTens [ tens ]);
if (ones > 0) {
- sb.append ('-');
- sb.append (frenchWordOnes [ ones ]);
+ sb.append('-');
+ sb.append(frenchWordOnes [ ones ]);
} else {
- sb.append ('s');
+ sb.append('s');
}
- wl.add (sb.toString());
+ wl.add(sb.toString());
} else if (tens == 9) {
StringBuffer sb = new StringBuffer();
- sb.append (frenchWordTens [ 8 ]);
- sb.append ('-');
- sb.append (frenchWordTeens [ ones ]);
- wl.add (sb.toString());
+ sb.append(frenchWordTens [ 8 ]);
+ sb.append('-');
+ sb.append(frenchWordTeens [ ones ]);
+ wl.add(sb.toString());
}
} else if (ones > 0) {
- wl.add (frenchWordOnes [ ones ]);
+ wl.add(frenchWordOnes [ ones ]);
}
return wl;
}
@@ -947,23 +947,23 @@ public class NumberConverter {
private static String[] spanishWordOnesOrdFemale = { "ninguna", "primera", "segunda", "tercera", "cuarta", "quinta", "sexta", "s\u00e9ptima", "octava", "noventa", "d\u00e9cima" };
private static class SpanishNumberAsWordFormatter implements SpecialNumberFormatter {
private int caseType = Character.UPPERCASE_LETTER;
- SpanishNumberAsWordFormatter (int caseType) {
+ SpanishNumberAsWordFormatter(int caseType) {
this.caseType = caseType;
}
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
List<String> wl = new ArrayList<String>();
if (number >= 1000000000000L) {
return null;
} else {
- boolean ordinal = hasFeature (features, "ordinal");
+ boolean ordinal = hasFeature(features, "ordinal");
if (number == 0) {
- wl.add (spanishWordOnes [ 0 ]);
+ wl.add(spanishWordOnes [ 0 ]);
} else if (ordinal && (number <= 10)) {
- boolean female = hasFeature (features, "female");
+ boolean female = hasFeature(features, "female");
if (female) {
- wl.add (spanishWordOnesOrdFemale [ (int) number ]);
+ wl.add(spanishWordOnesOrdFemale [ (int) number ]);
} else {
- wl.add (spanishWordOnesOrdMale [ (int) number ]);
+ wl.add(spanishWordOnesOrdMale [ (int) number ]);
}
} else {
int ones = (int) (number % 1000);
@@ -972,63 +972,63 @@ public class NumberConverter {
int billions = (int) ((number / 1000000000) % 1000);
if (billions > 0) {
if (billions > 1) {
- wl = formatOnesInThousand (wl, billions);
+ wl = formatOnesInThousand(wl, billions);
}
- wl.add (spanishWordOthers[2]);
- wl.add (spanishWordOthers[4]);
+ wl.add(spanishWordOthers[2]);
+ wl.add(spanishWordOthers[4]);
}
if (millions > 0) {
if (millions == 1) {
- wl.add (spanishWordOthers[0]);
+ wl.add(spanishWordOthers[0]);
} else {
- wl = formatOnesInThousand (wl, millions);
+ wl = formatOnesInThousand(wl, millions);
}
if (millions > 1) {
- wl.add (spanishWordOthers[4]);
+ wl.add(spanishWordOthers[4]);
} else {
- wl.add (spanishWordOthers[3]);
+ wl.add(spanishWordOthers[3]);
}
}
if (thousands > 0) {
if (thousands > 1) {
- wl = formatOnesInThousand (wl, thousands);
+ wl = formatOnesInThousand(wl, thousands);
}
- wl.add (spanishWordOthers[2]);
+ wl.add(spanishWordOthers[2]);
}
if (ones > 0) {
- wl = formatOnesInThousand (wl, ones);
+ wl = formatOnesInThousand(wl, ones);
}
}
- wl = convertWordCase (wl, caseType);
- return UTF32.toUTF32 (joinWords (wl, " "), 0, true);
+ wl = convertWordCase(wl, caseType);
+ return UTF32.toUTF32(joinWords(wl, " "), 0, true);
}
}
- private List<String> formatOnesInThousand (List<String> wl, int number) {
+ private List<String> formatOnesInThousand(List<String> wl, int number) {
assert number < 1000;
int ones = number % 10;
int tens = (number / 10) % 10;
int hundreds = (number / 100) % 10;
if (hundreds > 0) {
if ((hundreds == 1) && (tens == 0) && (ones == 0)) {
- wl.add (spanishWordOthers[1]);
+ wl.add(spanishWordOthers[1]);
} else {
- wl.add (spanishWordHundreds [ hundreds ]);
+ wl.add(spanishWordHundreds [ hundreds ]);
}
}
if (tens > 0) {
if (tens == 1) {
- wl.add (spanishWordTeens [ ones ]);
+ wl.add(spanishWordTeens [ ones ]);
} else if (tens == 2) {
- wl.add (spanishWordTweens [ ones ]);
+ wl.add(spanishWordTweens [ ones ]);
} else {
- wl.add (spanishWordTens [ tens ]);
+ wl.add(spanishWordTens [ tens ]);
if (ones > 0) {
- wl.add ("y");
- wl.add (spanishWordOnes [ ones ]);
+ wl.add("y");
+ wl.add(spanishWordOnes [ ones ]);
}
}
} else if (ones > 0) {
- wl.add (spanishWordOnes [ ones ]);
+ wl.add(spanishWordOnes [ ones ]);
}
return wl;
}
@@ -1150,17 +1150,17 @@ public class NumberConverter {
"\u2160"
};
private static class RomanNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
List<Integer> sl = new ArrayList<Integer>();
if (number == 0) {
return null;
} else {
String[] forms;
int maxNumber;
- if (hasFeature (features, "unicode-number-forms")) {
+ if (hasFeature(features, "unicode-number-forms")) {
forms = romanNumberForms;
maxNumber = 199999;
- } else if (hasFeature (features, "large")) {
+ } else if (hasFeature(features, "large")) {
forms = romanLargeForms;
maxNumber = 199999;
} else {
@@ -1174,16 +1174,16 @@ public class NumberConverter {
for (int i = 0, n = romanMapping.length; i < n; i++) {
int d = romanMapping [ i ];
if ((number >= d) && (forms [ i ] != null)) {
- appendScalars (sl, UTF32.toUTF32 (forms [ i ], 0, true));
+ appendScalars(sl, UTF32.toUTF32(forms [ i ], 0, true));
number = number - d;
break;
}
}
}
if (one == (int) 'I') {
- return toUpperCase (sl.toArray (new Integer [ sl.size() ]));
+ return toUpperCase(sl.toArray(new Integer [ sl.size() ]));
} else if (one == (int) 'i') {
- return toLowerCase (sl.toArray (new Integer [ sl.size() ]));
+ return toLowerCase(sl.toArray(new Integer [ sl.size() ]));
} else {
return null;
}
@@ -1196,7 +1196,7 @@ public class NumberConverter {
* Isopsephry (Greek) Numerals
*/
private static class IsopsephryNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
return null;
}
}
@@ -1237,15 +1237,15 @@ public class NumberConverter {
0x05E5, // FINAL TSADHI
};
private class GematriaNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
if (one == 0x05D0) {
if (letterValue == LETTER_VALUE_ALPHABETIC) {
- return formatNumberAsSequence (number, one, hebrewGematriaAlphabeticMap.length, hebrewGematriaAlphabeticMap);
+ return formatNumberAsSequence(number, one, hebrewGematriaAlphabeticMap.length, hebrewGematriaAlphabeticMap);
} else if (letterValue == LETTER_VALUE_TRADITIONAL) {
if ((number == 0) || (number > 1999)) {
return null;
} else {
- return formatAsGematriaNumber (number, features, language, country);
+ return formatAsGematriaNumber(number, features, language, country);
}
} else {
return null;
@@ -1254,7 +1254,7 @@ public class NumberConverter {
return null;
}
}
- private Integer[] formatAsGematriaNumber (long number, String features, String language, String country) {
+ private Integer[] formatAsGematriaNumber(long number, String features, String language, String country) {
List<Integer> sl = new ArrayList<Integer>();
assert hebrewGematriaAlphabeticMap.length == 27;
assert hebrewGematriaAlphabeticMap[0] == 0x05D0; // ALEF
@@ -1267,43 +1267,43 @@ public class NumberConverter {
int tens = (int) ((number / 10) % 10);
int ones = (int) ((number / 1) % 10);
if (thousands > 0) {
- sl.add (map [ 0 + (thousands - 1) ]);
- sl.add (0x05F3);
+ sl.add(map [ 0 + (thousands - 1) ]);
+ sl.add(0x05F3);
}
if (hundreds > 0) {
assert hundreds < 10;
if (hundreds < 5) {
- sl.add (map [ 18 + (hundreds - 1) ]);
+ sl.add(map [ 18 + (hundreds - 1) ]);
} else if (hundreds < 9) {
- sl.add (map [ 18 + (4 - 1) ]);
- sl.add (0x05F4);
- sl.add (map [ 18 + (hundreds - 5) ]);
+ sl.add(map [ 18 + (4 - 1) ]);
+ sl.add(0x05F4);
+ sl.add(map [ 18 + (hundreds - 5) ]);
} else if (hundreds == 9) {
- sl.add (map [ 18 + (4 - 1) ]);
- sl.add (map [ 18 + (4 - 1) ]);
- sl.add (0x05F4);
- sl.add (map [ 18 + (hundreds - 9) ]);
+ sl.add(map [ 18 + (4 - 1) ]);
+ sl.add(map [ 18 + (4 - 1) ]);
+ sl.add(0x05F4);
+ sl.add(map [ 18 + (hundreds - 9) ]);
}
}
if (number == 15) {
- sl.add (map [ 9 - 1]);
- sl.add (0x05F4);
- sl.add (map [ 6 - 1]);
+ sl.add(map [ 9 - 1]);
+ sl.add(0x05F4);
+ sl.add(map [ 6 - 1]);
} else if (number == 16) {
- sl.add (map [ 9 - 1 ]);
- sl.add (0x05F4);
- sl.add (map [ 7 - 1 ]);
+ sl.add(map [ 9 - 1 ]);
+ sl.add(0x05F4);
+ sl.add(map [ 7 - 1 ]);
} else {
if (tens > 0) {
assert tens < 10;
- sl.add (map [ 9 + (tens - 1) ]);
+ sl.add(map [ 9 + (tens - 1) ]);
}
if (ones > 0) {
assert ones < 10;
- sl.add (map [ 0 + (ones - 1) ]);
+ sl.add(map [ 0 + (ones - 1) ]);
}
}
- return sl.toArray (new Integer [ sl.size() ]);
+ return sl.toArray(new Integer [ sl.size() ]);
}
}
@@ -1375,7 +1375,7 @@ public class NumberConverter {
0x0649, // ALEF MAQSURA
};
private class ArabicNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
if (one == 0x0627) {
int[] map;
if (letterValue == LETTER_VALUE_TRADITIONAL) {
@@ -1385,18 +1385,18 @@ public class NumberConverter {
} else {
map = arabicAbjadiAlphabeticMap;
}
- return formatNumberAsSequence (number, one, map.length, map);
+ return formatNumberAsSequence(number, one, map.length, map);
} else if (one == 0x0623) {
if ((number == 0) || (number > 1999)) {
return null;
} else {
- return formatAsAbjadiNumber (number, features, language, country);
+ return formatAsAbjadiNumber(number, features, language, country);
}
} else {
return null;
}
}
- private Integer[] formatAsAbjadiNumber (long number, String features, String language, String country) {
+ private Integer[] formatAsAbjadiNumber(long number, String features, String language, String country) {
List<Integer> sl = new ArrayList<Integer>();
assert arabicAbjadiAlphabeticMap.length == 28;
assert arabicAbjadiAlphabeticMap[0] == 0x0623; // ALEF WITH HAMZA ABOVE
@@ -1410,21 +1410,21 @@ public class NumberConverter {
int ones = (int) ((number / 1) % 10);
if (thousands > 0) {
assert thousands < 2;
- sl.add (map [ 27 + (thousands - 1) ]);
+ sl.add(map [ 27 + (thousands - 1) ]);
}
if (hundreds > 0) {
assert thousands < 10;
- sl.add (map [ 18 + (hundreds - 1) ]);
+ sl.add(map [ 18 + (hundreds - 1) ]);
}
if (tens > 0) {
assert tens < 10;
- sl.add (map [ 9 + (tens - 1) ]);
+ sl.add(map [ 9 + (tens - 1) ]);
}
if (ones > 0) {
assert ones < 10;
- sl.add (map [ 0 + (ones - 1) ]);
+ sl.add(map [ 0 + (ones - 1) ]);
}
- return sl.toArray (new Integer [ sl.size() ]);
+ return sl.toArray(new Integer [ sl.size() ]);
}
}
@@ -1532,11 +1532,11 @@ public class NumberConverter {
0x30F3, // N
};
private class KanaNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
if ((one == 0x3042) && (letterValue == LETTER_VALUE_ALPHABETIC)) {
- return formatNumberAsSequence (number, one, hiraganaGojuonAlphabeticMap.length, hiraganaGojuonAlphabeticMap);
+ return formatNumberAsSequence(number, one, hiraganaGojuonAlphabeticMap.length, hiraganaGojuonAlphabeticMap);
} else if ((one == 0x30A2) && (letterValue == LETTER_VALUE_ALPHABETIC)) {
- return formatNumberAsSequence (number, one, katakanaGojuonAlphabeticMap.length, katakanaGojuonAlphabeticMap);
+ return formatNumberAsSequence(number, one, katakanaGojuonAlphabeticMap.length, katakanaGojuonAlphabeticMap);
} else {
return null;
}
@@ -1595,9 +1595,9 @@ public class NumberConverter {
0x0E2E,
};
private class ThaiNumeralsFormatter implements SpecialNumberFormatter {
- public Integer[] format (long number, int one, int letterValue, String features, String language, String country) {
+ public Integer[] format(long number, int one, int letterValue, String features, String language, String country) {
if ((one == 0x0E01) && (letterValue == LETTER_VALUE_ALPHABETIC)) {
- return formatNumberAsSequence (number, one, thaiAlphabeticMap.length, thaiAlphabeticMap);
+ return formatNumberAsSequence(number, one, thaiAlphabeticMap.length, thaiAlphabeticMap);
} else {
return null;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/ScriptContextTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/ScriptContextTester.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/ScriptContextTester.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/ScriptContextTester.java Tue May 7 16:23:13 2013
@@ -31,6 +31,6 @@ public interface ScriptContextTester {
* @param feature a feature identifier
* @return a glyph context tester or null if none available for the specified feature
*/
- GlyphContextTester getTester (String feature);
+ GlyphContextTester getTester(String feature);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java Tue May 7 16:23:13 2013
@@ -46,7 +46,7 @@ public final class UTF32 {
* @throws IllegalArgumentException if substitution required and errorOnSubstitution
* is not false
*/
- public static Integer[] toUTF32 (String s, int substitution, boolean errorOnSubstitution)
+ public static Integer[] toUTF32(String s, int substitution, boolean errorOnSubstitution)
throws IllegalArgumentException {
int n;
if ((n = s.length()) == 0) {
@@ -58,23 +58,23 @@ public final class UTF32 {
int c = (int) s.charAt(i);
if ((c >= 0xD800) && (c < 0xE000)) {
int s1 = c;
- int s2 = ((i + 1) < n) ? (int) s.charAt (i + 1) : 0;
+ int s2 = ((i + 1) < n) ? (int) s.charAt(i + 1) : 0;
if (s1 < 0xDC00) {
if ((s2 >= 0xDC00) && (s2 < 0xE000)) {
c = ((s1 - 0xD800) << 10) + (s2 - 0xDC00) + 65536;
i++;
} else {
if (errorOnSubstitution) {
- throw new IllegalArgumentException
- ("isolated high (leading) surrogate");
+ throw new IllegalArgumentException(
+ "isolated high (leading) surrogate");
} else {
c = substitution;
}
}
} else {
if (errorOnSubstitution) {
- throw new IllegalArgumentException
- ("isolated low (trailing) surrogate");
+ throw new IllegalArgumentException(
+ "isolated low (trailing) surrogate");
} else {
c = substitution;
}
@@ -86,7 +86,7 @@ public final class UTF32 {
return sa;
} else {
Integer[] na = new Integer [ k ];
- System.arraycopy (sa, 0, na, 0, k);
+ System.arraycopy(sa, 0, na, 0, k);
return na;
}
}
@@ -99,27 +99,27 @@ public final class UTF32 {
* @throws IllegalArgumentException if an input scalar value is illegal,
* e.g., a surrogate or out of range
*/
- public static String fromUTF32 (Integer[] sa) throws IllegalArgumentException {
+ public static String fromUTF32(Integer[] sa) throws IllegalArgumentException {
StringBuffer sb = new StringBuffer();
for (int s : sa) {
if (s < 65535) {
if ((s < 0xD800) || (s > 0xDFFF)) {
- sb.append ((char) s);
+ sb.append((char) s);
} else {
String ncr = CharUtilities.charToNCRef(s);
- throw new IllegalArgumentException
- ("illegal scalar value 0x" + ncr.substring(2, ncr.length() - 1)
+ throw new IllegalArgumentException(
+ "illegal scalar value 0x" + ncr.substring(2, ncr.length() - 1)
+ "; cannot be UTF-16 surrogate");
}
} else if (s < 1114112) {
int s1 = (((s - 65536) >> 10) & 0x3FF) + 0xD800;
int s2 = (((s - 65536) >> 0) & 0x3FF) + 0xDC00;
- sb.append ((char) s1);
- sb.append ((char) s2);
+ sb.append((char) s1);
+ sb.append((char) s2);
} else {
String ncr = CharUtilities.charToNCRef(s);
- throw new IllegalArgumentException
- ("illegal scalar value 0x" + ncr.substring(2, ncr.length() - 1)
+ throw new IllegalArgumentException(
+ "illegal scalar value 0x" + ncr.substring(2, ncr.length() - 1)
+ "; out of range for UTF-16");
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java Tue May 7 16:23:13 2013
@@ -47,15 +47,15 @@ public final class EventFormatter {
//utility class
}
- private static ResourceBundle getBundle (String groupID, Locale locale) {
+ private static ResourceBundle getBundle(String groupID, Locale locale) {
ResourceBundle bundle;
String baseName = (groupID != null) ? groupID : EventFormatter.class.getName();
try {
ClassLoader classLoader = EventFormatter.class.getClassLoader();
- bundle = XMLResourceBundle.getXMLBundle (baseName, locale, classLoader);
+ bundle = XMLResourceBundle.getXMLBundle(baseName, locale, classLoader);
} catch (MissingResourceException e) {
if (log.isTraceEnabled()) {
- log.trace ("No XMLResourceBundle for " + baseName + " available.");
+ log.trace("No XMLResourceBundle for " + baseName + " available.");
}
bundle = null;
}
@@ -67,8 +67,8 @@ public final class EventFormatter {
* @param event the event
* @return the formatted message
*/
- public static String format (Event event) {
- return format (event, event.getLocale());
+ public static String format(Event event) {
+ return format(event, event.getLocale());
}
/**
@@ -78,19 +78,19 @@ public final class EventFormatter {
* @return the formatted message
*/
public static String format(Event event, Locale locale) {
- return format (event, getBundle (event.getEventGroupID(), locale));
+ return format(event, getBundle(event.getEventGroupID(), locale));
}
- private static String format (Event event, ResourceBundle bundle) {
+ private static String format(Event event, ResourceBundle bundle) {
assert event != null;
String key = event.getEventKey();
String template;
if (bundle != null) {
- template = bundle.getString (key);
+ template = bundle.getString(key);
} else {
template = "Missing bundle. Can't lookup event key: '" + key + "'.";
}
- return format (event, processIncludes (template, bundle));
+ return format(event, processIncludes(template, bundle));
}
private static String processIncludes(String template, ResourceBundle bundle) {
@@ -154,7 +154,7 @@ public final class EventFormatter {
public void write(StringBuffer sb, Map params) {
String groupID = (String) params.get("groupID");
Locale locale = (Locale) params.get("locale");
- ResourceBundle bundle = getBundle (groupID, locale);
+ ResourceBundle bundle = getBundle(groupID, locale);
if (bundle != null) {
sb.append(bundle.getString(getKey(params)));
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java Tue May 7 16:23:13 2013
@@ -438,7 +438,7 @@ public abstract class FONode implements
* with the unabbreviated URI otherwise.
*/
public static String getNodeString(String namespaceURI, String localName) {
- String prefix = getNodePrefix (namespaceURI);
+ String prefix = getNodePrefix(namespaceURI);
if (prefix != null) {
return prefix + ":" + localName;
} else {
@@ -552,7 +552,7 @@ public abstract class FONode implements
protected void invalidChildError(Locator loc, String parentName, String nsURI, String lName,
String ruleViolated)
throws ValidationException {
- String prefix = getNodePrefix (nsURI);
+ String prefix = getNodePrefix(nsURI);
QName qn; // qualified name of offending node
if (prefix != null) {
qn = new QName(nsURI, prefix, lName);
@@ -926,7 +926,7 @@ public abstract class FONode implements
* @return true if indicated boundary (or boundaries) constitute a delimited text range
* boundary.
*/
- public boolean isDelimitedTextRangeBoundary (int boundary) {
+ public boolean isDelimitedTextRangeBoundary(int boundary) {
return true;
}
@@ -936,10 +936,10 @@ public abstract class FONode implements
* @param ranges a stack of delimited text ranges
* @return the (possibly) updated stack of delimited text ranges
*/
- public Stack collectDelimitedTextRanges (Stack ranges) {
+ public Stack collectDelimitedTextRanges(Stack ranges) {
// if boundary before, then push new range
if (isRangeBoundaryBefore()) {
- maybeNewRange (ranges);
+ maybeNewRange(ranges);
}
// get current range, if one exists
DelimitedTextRange currentRange;
@@ -949,10 +949,10 @@ public abstract class FONode implements
currentRange = null;
}
// proceses this node
- ranges = collectDelimitedTextRanges (ranges, currentRange);
+ ranges = collectDelimitedTextRanges(ranges, currentRange);
// if boundary after, then push new range
if (isRangeBoundaryAfter()) {
- maybeNewRange (ranges);
+ maybeNewRange(ranges);
}
return ranges;
}
@@ -965,9 +965,9 @@ public abstract class FONode implements
* @param currentRange the current range or null (if none)
* @return the (possibly) updated stack of delimited text ranges
*/
- protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
for (Iterator it = getChildNodes(); (it != null) && it.hasNext();) {
- ranges = ((FONode) it.next()).collectDelimitedTextRanges (ranges);
+ ranges = ((FONode) it.next()).collectDelimitedTextRanges(ranges);
}
return ranges;
}
@@ -992,7 +992,7 @@ public abstract class FONode implements
* @param ranges stack of delimited text ranges
* @return new range (if constructed and pushed onto stack) or current range (if any) or null
*/
- private DelimitedTextRange maybeNewRange (Stack ranges) {
+ private DelimitedTextRange maybeNewRange(Stack ranges) {
DelimitedTextRange rCur = null; // current range (top of range stack)
DelimitedTextRange rNew = null; // new range to be pushed onto range stack
if (ranges.empty()) {
@@ -1002,13 +1002,13 @@ public abstract class FONode implements
} else {
rCur = (DelimitedTextRange) ranges.peek();
if (rCur != null) {
- if (!rCur.isEmpty() || !isSelfOrDescendent (rCur.getNode(), this)) {
+ if (!rCur.isEmpty() || !isSelfOrDescendent(rCur.getNode(), this)) {
rNew = new DelimitedTextRange(this);
}
}
}
if (rNew != null) {
- ranges.push (rNew);
+ ranges.push(rNew);
} else {
rNew = rCur;
}
@@ -1016,17 +1016,17 @@ public abstract class FONode implements
}
private boolean isRangeBoundaryBefore() {
- return isDelimitedTextRangeBoundary (Constants.EN_BEFORE);
+ return isDelimitedTextRangeBoundary(Constants.EN_BEFORE);
}
private boolean isRangeBoundaryAfter() {
- return isDelimitedTextRangeBoundary (Constants.EN_AFTER);
+ return isDelimitedTextRangeBoundary(Constants.EN_AFTER);
}
/**
* Determine if node N2 is the same or a descendent of node N1.
*/
- private static boolean isSelfOrDescendent (FONode n1, FONode n2) {
+ private static boolean isSelfOrDescendent(FONode n1, FONode n2) {
for (FONode n = n2; n != null; n = n.getParent()) {
if (n == n1) {
return true;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue May 7 16:23:13 2013
@@ -1503,7 +1503,7 @@ public final class FOPropertyMapping imp
addPropertyMaker("fox:block-progression-unit", l);
}
- private Property calcWritingModeDependent (int pv, int wm) {
+ private Property calcWritingModeDependent(int pv, int wm) {
if (pv == EN_LEFT) {
if (wm == Constants.EN_LR_TB) {
pv = EN_START;
@@ -1521,14 +1521,14 @@ public final class FOPropertyMapping imp
pv = EN_END;
}
}
- return makeWritingModeDependentEnum (pv);
+ return makeWritingModeDependentEnum(pv);
}
- private Property makeWritingModeDependentEnum (int pv) {
+ private Property makeWritingModeDependentEnum(int pv) {
if (pv == EN_START) {
- return getEnumProperty (EN_START, "START");
+ return getEnumProperty(EN_START, "START");
} else if (pv == EN_END) {
- return getEnumProperty (EN_END, "END");
+ return getEnumProperty(EN_END, "END");
} else {
return null;
}
@@ -1626,8 +1626,8 @@ public final class FOPropertyMapping imp
if (p != null) {
int pv = p.getEnum();
if ((pv == EN_LEFT) || (pv == EN_RIGHT)) {
- p = calcWritingModeDependent
- (pv, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
+ p = calcWritingModeDependent(
+ pv, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
}
}
return p;
@@ -1676,11 +1676,11 @@ public final class FOPropertyMapping imp
} else if (correspondingValue == EN_CENTER) {
return getEnumProperty(EN_CENTER, "CENTER");
} else if (correspondingValue == EN_LEFT) {
- return calcWritingModeDependent
- (EN_LEFT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
+ return calcWritingModeDependent(
+ EN_LEFT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
} else if (correspondingValue == EN_RIGHT) {
- return calcWritingModeDependent
- (EN_RIGHT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
+ return calcWritingModeDependent(
+ EN_RIGHT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
} else {
return null;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Tue May 7 16:23:13 2013
@@ -717,7 +717,7 @@ public class FOText extends FONode imple
}
@Override
- public boolean isDelimitedTextRangeBoundary (int boundary) {
+ public boolean isDelimitedTextRangeBoundary(int boundary) {
return false;
}
@@ -737,7 +737,7 @@ public class FOText extends FONode imple
* @param start the starting index of interval
* @param end the ending index of interval
*/
- public void setBidiLevel (int level, int start, int end) {
+ public void setBidiLevel(int level, int start, int end) {
if (start < end) {
if (bidiLevels == null) {
bidiLevels = new int [ length() ];
@@ -746,7 +746,7 @@ public class FOText extends FONode imple
bidiLevels [ i ] = level;
}
if (parent != null) {
- ((FObj) parent).setBidiLevel (level);
+ ((FObj) parent).setBidiLevel(level);
}
} else {
assert start < end;
@@ -771,7 +771,7 @@ public class FOText extends FONode imple
* @return a (possibly empty) array of bidi levels or null
* in case no bidi levels have been assigned
*/
- public int[] getBidiLevels (int start, int end) {
+ public int[] getBidiLevels(int start, int end) {
if (this.bidiLevels != null) {
assert start <= end;
int n = end - start;
@@ -794,7 +794,7 @@ public class FOText extends FONode imple
* @throws IndexOutOfBoundsException if position is not non-negative integer
* or is greater than or equal to length
*/
- public int bidiLevelAt (int position) throws IndexOutOfBoundsException {
+ public int bidiLevelAt(int position) throws IndexOutOfBoundsException {
if ((position < 0) || (position >= length())) {
throw new IndexOutOfBoundsException();
} else if (bidiLevels != null) {
@@ -810,11 +810,11 @@ public class FOText extends FONode imple
* @param end index in character buffer
* @param mappedChars sequence of character codes denoting substituted characters
*/
- public void addMapping (int start, int end, CharSequence mappedChars) {
+ public void addMapping(int start, int end, CharSequence mappedChars) {
if (mappings == null) {
mappings = new java.util.HashMap();
}
- mappings.put (new MapRange (start, end), mappedChars.toString());
+ mappings.put(new MapRange(start, end), mappedChars.toString());
}
/**
@@ -824,8 +824,8 @@ public class FOText extends FONode imple
* @return true if a mapping exist such that the mapping's interval is coincident to
* [start,end)
*/
- public boolean hasMapping (int start, int end) {
- return (mappings != null) && (mappings.containsKey (new MapRange (start, end)));
+ public boolean hasMapping(int start, int end) {
+ return (mappings != null) && (mappings.containsKey(new MapRange(start, end)));
}
/**
@@ -835,9 +835,9 @@ public class FOText extends FONode imple
* @return a string of characters representing the mapping over the interval
* [start,end)
*/
- public String getMapping (int start, int end) {
+ public String getMapping(int start, int end) {
if (mappings != null) {
- return (String) mappings.get (new MapRange (start, end));
+ return (String) mappings.get(new MapRange(start, end));
} else {
return null;
}
@@ -849,9 +849,9 @@ public class FOText extends FONode imple
* @param end index in character buffer
* @return the length of the mapping (if present) or zero
*/
- public int getMappingLength (int start, int end) {
+ public int getMappingLength(int start, int end) {
if (mappings != null) {
- return ((String) mappings.get (new MapRange (start, end))) .length();
+ return ((String) mappings.get(new MapRange(start, end))) .length();
} else {
return 0;
}
@@ -864,18 +864,18 @@ public class FOText extends FONode imple
* @return a (possibly empty) array of bidi levels or null
* in case no bidi levels have been assigned
*/
- public int[] getMappingBidiLevels (int start, int end) {
- if (hasMapping (start, end)) {
+ public int[] getMappingBidiLevels(int start, int end) {
+ if (hasMapping(start, end)) {
int nc = end - start;
- int nm = getMappingLength (start, end);
- int[] la = getBidiLevels (start, end);
+ int nm = getMappingLength(start, end);
+ int[] la = getBidiLevels(start, end);
if (la == null) {
return null;
} else if (nm == nc) { // mapping is same length as mapped range
return la;
} else if (nm > nc) { // mapping is longer than mapped range
int[] ma = new int [ nm ];
- System.arraycopy (la, 0, ma, 0, la.length);
+ System.arraycopy(la, 0, ma, 0, la.length);
for (int i = la.length,
n = ma.length, l = (i > 0) ? la [ i - 1 ] : 0; i < n; i++) {
ma [ i ] = l;
@@ -883,18 +883,18 @@ public class FOText extends FONode imple
return ma;
} else { // mapping is shorter than mapped range
int[] ma = new int [ nm ];
- System.arraycopy (la, 0, ma, 0, ma.length);
+ System.arraycopy(la, 0, ma, 0, ma.length);
return ma;
}
} else {
- return getBidiLevels (start, end);
+ return getBidiLevels(start, end);
}
}
@Override
- protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
if (currentRange != null) {
- currentRange.append (charIterator(), this);
+ currentRange.append(charIterator(), this);
}
return ranges;
}
@@ -909,7 +909,7 @@ public class FOText extends FONode imple
public int hashCode() {
return (start * 31) + end;
}
- public boolean equals (Object o) {
+ public boolean equals(Object o) {
if (o instanceof MapRange) {
MapRange r = (MapRange) o;
return (r.start == start) && (r.end == end);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Tue May 7 16:23:13 2013
@@ -615,7 +615,7 @@ public abstract class FObj extends FONod
FObj foParent = (FObj) parent;
int parentBidiLevel = foParent.getBidiLevel();
if ((parentBidiLevel < 0) || (bidiLevel < parentBidiLevel)) {
- foParent.setBidiLevel (bidiLevel);
+ foParent.setBidiLevel(bidiLevel);
}
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java Tue May 7 16:23:13 2013
@@ -43,9 +43,9 @@ public class FromNearestSpecifiedValueFu
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
if (index == 0) {
- return getPropertyName (pi);
+ return getPropertyName(pi);
} else {
- return super.getOptionalArgDefault (index, pi);
+ return super.getOptionalArgDefault(index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java Tue May 7 16:23:13 2013
@@ -44,9 +44,9 @@ public class FromParentFunction extends
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
if (index == 0) {
- return getPropertyName (pi);
+ return getPropertyName(pi);
} else {
- return super.getOptionalArgDefault (index, pi);
+ return super.getOptionalArgDefault(index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java Tue May 7 16:23:13 2013
@@ -52,9 +52,9 @@ public class FromTableColumnFunction ext
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
if (index == 0) {
- return getPropertyName (pi);
+ return getPropertyName(pi);
} else {
- return super.getOptionalArgDefault (index, pi);
+ return super.getOptionalArgDefault(index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java Tue May 7 16:23:13 2013
@@ -36,8 +36,8 @@ public abstract class FunctionBase imple
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
if (index >= getOptionalArgsCount()) {
- PropertyException e = new PropertyException (new IndexOutOfBoundsException ("illegal optional argument index"));
- e.setPropertyInfo (pi);
+ PropertyException e = new PropertyException(new IndexOutOfBoundsException("illegal optional argument index"));
+ e.setPropertyInfo(pi);
throw e;
} else {
return null;
@@ -58,7 +58,7 @@ public abstract class FunctionBase imple
* @param pi property information instance that applies to property being evaluated
* @return string property whose value is name of property being evaluated
*/
- protected final Property getPropertyName (PropertyInfo pi) {
- return StringProperty.getInstance (pi.getPropertyMaker().getName());
+ protected final Property getPropertyName(PropertyInfo pi) {
+ return StringProperty.getInstance(pi.getPropertyMaker().getName());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java Tue May 7 16:23:13 2013
@@ -43,9 +43,9 @@ public class InheritedPropFunction exten
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
if (index == 0) {
- return getPropertyName (pi);
+ return getPropertyName(pi);
} else {
- return super.getOptionalArgDefault (index, pi);
+ return super.getOptionalArgDefault(index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java Tue May 7 16:23:13 2013
@@ -371,9 +371,9 @@ public final class PropertyParser extend
Property p = parseAdditiveExpr();
int i = args.size();
if ((i < numReq) || ((i - numReq) < numOpt) || hasVar) {
- args.add (p);
+ args.add(p);
} else {
- throw new PropertyException ("Unexpected function argument at index " + i);
+ throw new PropertyException("Unexpected function argument at index " + i);
}
// ignore extra args
if (currentToken != TOK_COMMA) {
@@ -389,11 +389,11 @@ public final class PropertyParser extend
} else {
for (int i = 0; i < numOpt; i++) {
if (args.size() < (numReq + i + 1)) {
- args.add (function.getOptionalArgDefault (i, propInfo));
+ args.add(function.getOptionalArgDefault(i, propInfo));
}
}
}
- return (Property[]) args.toArray (new Property [ args.size() ]);
+ return (Property[]) args.toArray(new Property [ args.size() ]);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org