Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B453F1CD for ; Sat, 30 Mar 2013 06:43:28 +0000 (UTC) Received: (qmail 66629 invoked by uid 500); 30 Mar 2013 06:43:26 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 66553 invoked by uid 500); 30 Mar 2013 06:43:26 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 66523 invoked by uid 99); 30 Mar 2013 06:43:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Mar 2013 06:43:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Mar 2013 06:43:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DA6002388C2C for ; Sat, 30 Mar 2013 06:41:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r856582 [23/34] - in /websites/production/commons/content/proper/commons-codec: ./ apidocs/ apidocs/org/apache/commons/codec/digest/ apidocs/src-html/org/apache/commons/codec/digest/ cobertura/ xref/org/apache/commons/codec/digest/ Date: Sat, 30 Mar 2013 06:41:32 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130330064136.DA6002388C2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.BeiderMorseEncoder.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.BeiderMorseEncoder.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.BeiderMorseEncoder.html Sat Mar 30 06:41:30 2013 @@ -157,7 +157,7 @@ 
  * @version $Id: BeiderMorseEncoder.java 1429868 2013-01-07 16:08:05Z ggregory $
 70   
  */
-  71  72 
 public class BeiderMorseEncoder implements StringEncoder {
+  71  144 
 public class BeiderMorseEncoder implements StringEncoder {
 72   
     // Implementation note: This class is a spring-friendly facade to PhoneticEngine. It allows read/write configuration
 73   @@ -166,18 +166,18 @@ 
 
 75   
     // a cached object
-  76  72 
     private PhoneticEngine engine = new PhoneticEngine(NameType.GENERIC, RuleType.APPROX, true);
+  76  144 
     private PhoneticEngine engine = new PhoneticEngine(NameType.GENERIC, RuleType.APPROX, true);
 77   
 
 78   
     @Override
 79   
     public Object encode(final Object source) throws EncoderException {
-  80  194 
         if (!(source instanceof String)) {
-  81  2 
             throw new EncoderException("BeiderMorseEncoder encode parameter is not of type String");
+  80  388 
         if (!(source instanceof String)) {
+  81  4 
             throw new EncoderException("BeiderMorseEncoder encode parameter is not of type String");
 82   
         }
-  83  192 
         return encode((String) source);
+  83  384 
         return encode((String) source);
 84   
     }
 85   @@ -186,11 +186,11 @@ 
     @Override
 87   
     public String encode(final String source) throws EncoderException {
-  88  134180 
         if (source == null) {
-  89  2 
             return null;
+  88  268360 
         if (source == null) {
+  89  4 
             return null;
 90   
         }
-  91  134178 
         return this.engine.encode(source);
+  91  268356 
         return this.engine.encode(source);
 92   
     }
 93   @@ -207,7 +207,7 @@ 
      */
 99   
     public NameType getNameType() {
-  100  2 
         return this.engine.getNameType();
+  100  4 
         return this.engine.getNameType();
 101   
     }
 102   @@ -224,7 +224,7 @@ 
      */
 108   
     public RuleType getRuleType() {
-  109  2 
         return this.engine.getRuleType();
+  109  4 
         return this.engine.getRuleType();
 110   
     }
 111   @@ -241,7 +241,7 @@ 
      */
 117   
     public boolean isConcat() {
-  118  2 
         return this.engine.isConcat();
+  118  4 
         return this.engine.isConcat();
 119   
     }
 120   @@ -262,14 +262,14 @@ 
      */
 128   
     public void setConcat(final boolean concat) {
-  129  2 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
+  129  4 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
 130   
                                          this.engine.getRuleType(),
 131   
                                          concat,
 132   
                                          this.engine.getMaxPhonemes());
-  133  2 
     }
+  133  4 
     }
 134   
 
 135   @@ -288,14 +288,14 @@ 
      */
 142   
     public void setNameType(final NameType nameType) {
-  143  22 
         this.engine = new PhoneticEngine(nameType,
+  143  44 
         this.engine = new PhoneticEngine(nameType,
 144   
                                          this.engine.getRuleType(),
 145   
                                          this.engine.isConcat(),
 146   
                                          this.engine.getMaxPhonemes());
-  147  22 
     }
+  147  44 
     }
 148   
 
 149   @@ -312,14 +312,14 @@ 
      */
 155   
     public void setRuleType(final RuleType ruleType) {
-  156  24 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
+  156  48 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
 157   
                                          ruleType,
 158   
                                          this.engine.isConcat(),
 159   
                                          this.engine.getMaxPhonemes());
-  160  22 
     }
+  160  44 
     }
 161   
 
 162   @@ -338,20 +338,20 @@ 
      */
 169   
     public void setMaxPhonemes(final int maxPhonemes) {
-  170  2 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
+  170  4 
         this.engine = new PhoneticEngine(this.engine.getNameType(),
 171   
                                          this.engine.getRuleType(),
 172   
                                          this.engine.isConcat(),
 173   
                                          maxPhonemes);
-  174  2 
     }
+  174  4 
     }
 175   
 
 176   
 }
-
Report generated by Cobertura 1.9.4.1 on 3/30/13 1:58 AM.
+
Report generated by Cobertura 1.9.4.1 on 3/30/13 2:39 AM.
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.Lang.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.Lang.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.Lang.html Sat Mar 30 06:41:30 2013 @@ -177,7 +177,7 @@ 
     // should be strongly encouraged to use the static factory <code>instance</code> method to get their Lang instances.
 79   
 
-  80  15532 
     private static final class LangRule {
+  80  31064 
     private static final class LangRule {
 81   
         private final boolean acceptOnMatch;
 82   @@ -186,23 +186,23 @@ 
         private final Pattern pattern;
 84   
 
-  85  1512 
         private LangRule(final Pattern pattern, final Set<String> languages, final boolean acceptOnMatch) {
-  86  1512 
             this.pattern = pattern;
-  87  1512 
             this.languages = languages;
-  88  1512 
             this.acceptOnMatch = acceptOnMatch;
-  89  1512 
         }
+  85  3024 
         private LangRule(final Pattern pattern, final Set<String> languages, final boolean acceptOnMatch) {
+  86  3024 
             this.pattern = pattern;
+  87  3024 
             this.languages = languages;
+  88  3024 
             this.acceptOnMatch = acceptOnMatch;
+  89  3024 
         }
 90   
 
 91   
         public boolean matches(final String txt) {
-  92  33849648 
             return this.pattern.matcher(txt).find();
+  92  67699296 
             return this.pattern.matcher(txt).find();
 93   
         }
 94   
     }
 95   
 
-  96  2 
     private static final Map<NameType, Lang> Langs = new EnumMap<NameType, Lang>(NameType.class);
+  96  4 
     private static final Map<NameType, Lang> Langs = new EnumMap<NameType, Lang>(NameType.class);
 97   
 
 98   @@ -211,11 +211,11 @@ 
 
 100   
     static {
-  101  8 
         for (final NameType s : NameType.values()) {
-  102  6 
             Langs.put(s, loadFromResource(LANGUAGE_RULES_RN, Languages.getInstance(s)));
+  101  16 
         for (final NameType s : NameType.values()) {
+  102  12 
             Langs.put(s, loadFromResource(LANGUAGE_RULES_RN, Languages.getInstance(s)));
 103   
         }
-  104  2 
     }
+  104  4 
     }
 105   
 
 106   @@ -234,7 +234,7 @@ 
      */
 113   
     public static Lang instance(final NameType nameType) {
-  114  290 
         return Langs.get(nameType);
+  114  580 
         return Langs.get(nameType);
 115   
     }
 116   @@ -265,62 +265,62 @@ 
      */
 129   
     public static Lang loadFromResource(final String languageRulesResourceName, final Languages languages) {
-  130  8 
         final List<LangRule> rules = new ArrayList<LangRule>();
-  131  8 
         final InputStream lRulesIS = Lang.class.getClassLoader().getResourceAsStream(languageRulesResourceName);
+  130  16 
         final List<LangRule> rules = new ArrayList<LangRule>();
+  131  16 
         final InputStream lRulesIS = Lang.class.getClassLoader().getResourceAsStream(languageRulesResourceName);
 132   
 
-  133  8 
         if (lRulesIS == null) {
-  134  2 
             throw new IllegalStateException("Unable to resolve required resource:" + LANGUAGE_RULES_RN);
+  133  16 
         if (lRulesIS == null) {
+  134  4 
             throw new IllegalStateException("Unable to resolve required resource:" + LANGUAGE_RULES_RN);
 135   
         }
 136   
 
-  137  6 
         final Scanner scanner = new Scanner(lRulesIS, ResourceConstants.ENCODING);
-  138  6 
         boolean inExtendedComment = false;
-  139  1764 
         while (scanner.hasNextLine()) {
-  140  1758 
             final String rawLine = scanner.nextLine();
-  141  1758 
             String line = rawLine;
+  137  12 
         final Scanner scanner = new Scanner(lRulesIS, ResourceConstants.ENCODING);
+  138  12 
         boolean inExtendedComment = false;
+  139  3528 
         while (scanner.hasNextLine()) {
+  140  3516 
             final String rawLine = scanner.nextLine();
+  141  3516 
             String line = rawLine;
 142   
 
-  143  1758 
             if (inExtendedComment) {
+  143  3516 
             if (inExtendedComment) {
 144   
                 // check for closing comment marker, otherwise discard doc comment line
-  145  90 
                 if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
-  146  6 
                     inExtendedComment = false;
+  145  180 
                 if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
+  146  12 
                     inExtendedComment = false;
 147   
                 }
 148   
             } else {
-  149  1668 
                 if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
-  150  6 
                     inExtendedComment = true;
+  149  3336 
                 if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+  150  12 
                     inExtendedComment = true;
 151   
                 } else {
 152   
                     // discard comments
-  153  1662 
                     final int cmtI = line.indexOf(ResourceConstants.CMT);
-  154  1662 
                     if (cmtI >= 0) {
-  155  288 
                         line = line.substring(0, cmtI);
+  153  3324 
                     final int cmtI = line.indexOf(ResourceConstants.CMT);
+  154  3324 
                     if (cmtI >= 0) {
+  155  576 
                         line = line.substring(0, cmtI);
 156   
                     }
 157   
 
 158   
                     // trim leading-trailing whitespace
-  159  1662 
                     line = line.trim();
+  159  3324 
                     line = line.trim();
 160   
 
-  161  1662 
                     if (line.length() == 0) {
-  162  150 
                         continue; // empty lines can be safely skipped
+  161  3324 
                     if (line.length() == 0) {
+  162  300 
                         continue; // empty lines can be safely skipped
 163   
                     }
 164   
 
 165   
                     // split it up
-  166  1512 
                     final String[] parts = line.split("\\s+");
+  166  3024 
                     final String[] parts = line.split("\\s+");
 167   
 
-  168  1512 
                     if (parts.length != 3) {
+  168  3024 
                     if (parts.length != 3) {
 169  0 
                         throw new IllegalArgumentException("Malformed line '" + rawLine + "' in language resource '" +
 170   
                                                            languageRulesResourceName + "'");
@@ -328,20 +328,20 @@ 
                     }
 172   
 
-  173  1512 
                     final Pattern pattern = Pattern.compile(parts[0]);
-  174  1512 
                     final String[] langs = parts[1].split("\\+");
-  175  1512 
                     final boolean accept = parts[2].equals("true");
+  173  3024 
                     final Pattern pattern = Pattern.compile(parts[0]);
+  174  3024 
                     final String[] langs = parts[1].split("\\+");
+  175  3024 
                     final boolean accept = parts[2].equals("true");
 176   
 
-  177  1512 
                     rules.add(new LangRule(pattern, new HashSet<String>(Arrays.asList(langs)), accept));
+  177  3024 
                     rules.add(new LangRule(pattern, new HashSet<String>(Arrays.asList(langs)), accept));
 178   
                 }
 179   
             }
-  180  1608 
         }
+  180  3216 
         }
 181   
 
-  182  6 
         return new Lang(rules, languages);
+  182  12 
         return new Lang(rules, languages);
 183   
     }
 184   @@ -352,10 +352,10 @@ 
     private final List<LangRule> rules;
 187   
 
-  188  6 
     private Lang(final List<LangRule> rules, final Languages languages) {
-  189  6 
         this.rules = Collections.unmodifiableList(rules);
-  190  6 
         this.languages = languages;
-  191  6 
     }
+  188  12 
     private Lang(final List<LangRule> rules, final Languages languages) {
+  189  12 
         this.rules = Collections.unmodifiableList(rules);
+  190  12 
         this.languages = languages;
+  191  12 
     }
 192   
 
 193   @@ -396,17 +396,17 @@ 
      */
 212   
     public Languages.LanguageSet guessLanguages(final String input) {
-  213  134324 
         final String text = input.toLowerCase(Locale.ENGLISH);
+  213  268648 
         final String text = input.toLowerCase(Locale.ENGLISH);
 214   
 
-  215  134324 
         final Set<String> langs = new HashSet<String>(this.languages.getLanguages());
-  216  134324 
         for (final LangRule rule : this.rules) {
-  217  33849648 
             if (rule.matches(text)) {
-  218  7010 
                 if (rule.acceptOnMatch) {
-  219  814 
                     langs.retainAll(rule.languages);
+  215  268648 
         final Set<String> langs = new HashSet<String>(this.languages.getLanguages());
+  216  268648 
         for (final LangRule rule : this.rules) {
+  217  67699296 
             if (rule.matches(text)) {
+  218  14020 
                 if (rule.acceptOnMatch) {
+  219  1628 
                     langs.retainAll(rule.languages);
 220   
                 } else {
-  221  6196 
                     langs.removeAll(rule.languages);
+  221  12392 
                     langs.removeAll(rule.languages);
 222   
                 }
 223   @@ -415,14 +415,14 @@ 
         }
 225   
 
-  226  134324 
         final Languages.LanguageSet ls = Languages.LanguageSet.from(langs);
-  227  134324 
         return ls.equals(Languages.NO_LANGUAGES) ? Languages.ANY_LANGUAGE : ls;
+  226  268648 
         final Languages.LanguageSet ls = Languages.LanguageSet.from(langs);
+  227  268648 
         return ls.equals(Languages.NO_LANGUAGES) ? Languages.ANY_LANGUAGE : ls;
 228   
     }
 229   
 }
-
Report generated by Cobertura 1.9.4.1 on 3/30/13 1:58 AM.
+
Report generated by Cobertura 1.9.4.1 on 3/30/13 2:39 AM.
\ No newline at end of file