Author: spepping
Date: Sat Oct 2 18:30:00 2010
New Revision: 1003850
URL: http://svn.apache.org/viewvc?rev=1003850&view=rev
Log:
Fixing a few checkstyle warnings
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java?rev=1003850&r1=1003849&r2=1003850&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
Sat Oct 2 18:30:00 2010
@@ -92,7 +92,7 @@ public class FopFactoryConfigurator {
* @param factory fop factory
* @throws FOPException fop exception
*/
- public void configure(FopFactory factory) throws FOPException {
+ public void configure(FopFactory factory) throws FOPException { //
CSOK: MethodLength
// strict configuration
if (cfg.getChild("strict-configuration", false) != null) {
try {
@@ -105,7 +105,7 @@ public class FopFactoryConfigurator {
boolean strict = factory.validateUserConfigStrictly();
if (log.isDebugEnabled()) {
log.debug("Initializing FopFactory Configuration"
- + "with " + (strict?"strict":"permissive") + "
validation");
+ + "with " + (strict ? "strict" : "permissive") + "
validation");
}
if (cfg.getChild("accessibility", false) != null) {
@@ -163,7 +163,8 @@ public class FopFactoryConfigurator {
+ " element must exist (" + location + ")",
error);
} else if (!lang.matches("[a-zA-Z]{2}")) {
addError("The lang attribute of a hyphenation-pattern
configuration"
- + " element must consist of exactly two letters
(" + location + ")", error);
+ + " element must consist of exactly two letters ("
+ + location + ")", error);
}
lang = lang.toLowerCase();
@@ -174,7 +175,8 @@ public class FopFactoryConfigurator {
if (country != null) {
if (!country.matches("[a-zA-Z]{2}")) {
addError("The country attribute of a
hyphenation-pattern configuration"
- + " element must consist of exactly two
letters (" + location + ")", error);
+ + " element must consist of exactly two
letters ("
+ + location + ")", error);
}
country = country.toUpperCase();
}
@@ -195,7 +197,7 @@ public class FopFactoryConfigurator {
if (log.isDebugEnabled()) {
log.debug("Using hyphenation pattern filename " + filename
+ " for lang=\"" + lang + "\""
- + (country != null?", country=\"" + country +
"\"":""));
+ + (country != null ? ", country=\"" + country +
"\"" : ""));
}
}
factory.setHyphPatNames(hyphPatNames);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java?rev=1003850&r1=1003849&r2=1003850&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
Sat Oct 2 18:30:00 2010
@@ -40,7 +40,7 @@ import org.xml.sax.InputSource;
*
* @author Carlos Villegas <[email protected]>
*/
-public class Hyphenator {
+public final class Hyphenator {
/** logging instance */
protected static Log log = LogFactory.getLog(Hyphenator.class);
@@ -81,6 +81,7 @@ public class Hyphenator {
* @param lang the language
* @param country the country (may be null or "none")
* @param resolver resolver to find the hyphenation files
+ * @param hyphPatNames the map with user-configured hyphenation pattern
file names
* @return the hyphenation tree
*/
public static HyphenationTree getHyphenationTree(String lang,
@@ -328,6 +329,7 @@ public class Hyphenator {
* @param lang the language
* @param country the optional country code (may be null or "none")
* @param resolver resolver to find the hyphenation files
+ * @param hyphPatNames the map with user-configured hyphenation pattern
file names
* @param word the word to hyphenate
* @param leftMin the minimum number of characters before the hyphenation
point
* @param rightMin the minimum number of characters after the hyphenation
point
@@ -365,6 +367,7 @@ public class Hyphenator {
* @param lang the language
* @param country the optional country code (may be null or "none")
* @param resolver resolver to find the hyphenation files
+ * @param hyphPatNames the map with user-configured hyphenation pattern
file names
* @param word the word to hyphenate
* @param offset the offset of the first character in the "word" character
array
* @param len the length of the word
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
