You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/11/17 21:52:32 UTC
svn commit: r1542813 - in
/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:
digest/DigestUtils.java language/Metaphone.java language/bm/Lang.java
language/bm/PhoneticEngine.java language/bm/Rule.java
language/bm/RuleType.java
Author: tn
Date: Sun Nov 17 20:52:32 2013
New Revision: 1542813
URL: http://svn.apache.org/r1542813
Log:
Fix checkstyle warnings.
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java Sun Nov 17 20:52:32 2013
@@ -807,7 +807,8 @@ public class DigestUtils {
* @param messageDigest
* the {@link MessageDigest} to update
* @param valueToDigest
- * the value to update the {@link MessageDigest} with; converted to bytes using {@link StringUtils#getBytesUtf8(String)}
+ * the value to update the {@link MessageDigest} with;
+ * converted to bytes using {@link StringUtils#getBytesUtf8(String)}
* @return the updated {@link MessageDigest}
* @since 1.7
*/
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java Sun Nov 17 20:52:32 2013
@@ -32,8 +32,10 @@ import org.apache.commons.codec.StringEn
* Note, that this does not match the algorithm that ships with PHP, or the algorithm found in the Perl implementations:
* </p>
* <ul>
- * <li><a href="http://search.cpan.org/~mschwern/Text-Metaphone-1.96/Metaphone.pm">Text:Metaphone-1.96</a> (broken link 4/30/2013) </li>
- * <li><a href="https://metacpan.org/source/MSCHWERN/Text-Metaphone-1.96//Metaphone.pm">Text:Metaphone-1.96</a> (link checked 4/30/2013) </li>
+ * <li><a href="http://search.cpan.org/~mschwern/Text-Metaphone-1.96/Metaphone.pm">Text:Metaphone-1.96</a>
+ * (broken link 4/30/2013) </li>
+ * <li><a href="https://metacpan.org/source/MSCHWERN/Text-Metaphone-1.96//Metaphone.pm">Text:Metaphone-1.96</a>
+ * (link checked 4/30/2013) </li>
* </ul>
* <p>
* They have had undocumented changes from the originally published algorithm.
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java Sun Nov 17 20:52:32 2013
@@ -166,8 +166,8 @@ public class Lang {
final String[] parts = line.split("\\s+");
if (parts.length != 3) {
- throw new IllegalArgumentException("Malformed line '" + rawLine
- + "' in language resource '" + languageRulesResourceName + "'");
+ throw new IllegalArgumentException("Malformed line '" + rawLine +
+ "' in language resource '" + languageRulesResourceName + "'");
}
final Pattern pattern = Pattern.compile(parts[0]);
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java Sun Nov 17 20:52:32 2013
@@ -78,7 +78,7 @@ public class PhoneticEngine {
this.phonemes = new LinkedHashSet<Rule.Phoneme>();
this.phonemes.add(phoneme);
}
-
+
private PhonemeBuilder(final Set<Rule.Phoneme> phonemes) {
this.phonemes = phonemes;
}
@@ -110,9 +110,9 @@ public class PhoneticEngine {
EXPR: for (final Rule.Phoneme left : this.phonemes) {
for (final Rule.Phoneme right : phonemeExpr.getPhonemes()) {
- LanguageSet languages = left.getLanguages().restrictTo(right.getLanguages());
- if (!languages.isEmpty()) {
- final Rule.Phoneme join = new Phoneme(left, right, languages);
+ LanguageSet languages = left.getLanguages().restrictTo(right.getLanguages());
+ if (!languages.isEmpty()) {
+ final Rule.Phoneme join = new Phoneme(left, right, languages);
if (newPhonemes.size() < maxPhonemes) {
newPhonemes.add(join);
} else {
@@ -326,7 +326,8 @@ public class PhoneticEngine {
* @param finalRules the final rules to apply
* @return the resulting phonemes
*/
- private PhonemeBuilder applyFinalRules(final PhonemeBuilder phonemeBuilder, final Map<String, List<Rule>> finalRules) {
+ private PhonemeBuilder applyFinalRules(final PhonemeBuilder phonemeBuilder,
+ final Map<String, List<Rule>> finalRules) {
if (finalRules == null) {
throw new NullPointerException("finalRules can not be null");
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java Sun Nov 17 20:52:32 2013
@@ -108,7 +108,7 @@ public class Rule {
this.phonemeText = new StringBuilder(phonemeText);
this.languages = languages;
}
-
+
public Phoneme(final Phoneme phonemeLeft, final Phoneme phonemeRight) {
this(phonemeLeft.phonemeText, phonemeLeft.languages);
this.phonemeText.append(phonemeRight.phonemeText);
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java?rev=1542813&r1=1542812&r2=1542813&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java Sun Nov 17 20:52:32 2013
@@ -40,7 +40,7 @@ public enum RuleType {
/**
* Gets the rule name.
- *
+ *
* @return the rule name.
*/
public String getName() {