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 4DC221015A for ; Sat, 6 Apr 2013 16:42:06 +0000 (UTC) Received: (qmail 68920 invoked by uid 500); 6 Apr 2013 16:42:06 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 68850 invoked by uid 500); 6 Apr 2013 16:42:06 -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 68843 invoked by uid 99); 6 Apr 2013 16:42:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Apr 2013 16:42:06 +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, 06 Apr 2013 16:41:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 95D3B2388C38 for ; Sat, 6 Apr 2013 16:40:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r857520 [24/35] - in /websites/production/commons/content/proper/commons-codec: ./ apidocs/org/apache/commons/codec/binary/ apidocs/org/apache/commons/codec/digest/ apidocs/src-html/org/apache/commons/codec/binary/ apidocs/src-html/org/apac... Date: Sat, 06 Apr 2013 16:40:29 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130406164035.95D3B2388C38@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.Languages.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.Languages.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.Languages.html Sat Apr 6 16:40:25 2013 @@ -141,12 +141,12 @@ 
      * A set of languages.
 60   
      */
-  61  286312 
     public static abstract class LanguageSet {
+  61  214734 
     public static abstract class LanguageSet {
 62   
 
 63   
         public static LanguageSet from(final Set<String> langs) {
-  64  479912 
             return langs.isEmpty() ? NO_LANGUAGES : new SomeLanguages(langs);
+  64  359934 
             return langs.isEmpty() ? NO_LANGUAGES : new SomeLanguages(langs);
 65   
         }
 66   @@ -179,21 +179,21 @@ 
      * Some languages, explicitly enumerated.
 80   
      */
-  81  286304 
     public static final class SomeLanguages extends LanguageSet {
+  81  214728 
     public static final class SomeLanguages extends LanguageSet {
 82   
         private final Set<String> languages;
 83   
 
-  84  286304 
         private SomeLanguages(final Set<String> languages) {
-  85  286304 
             this.languages = Collections.unmodifiableSet(languages);
-  86  286304 
         }
+  84  214728 
         private SomeLanguages(final Set<String> languages) {
+  85  214728 
             this.languages = Collections.unmodifiableSet(languages);
+  86  214728 
         }
 87   
 
 88   
         @Override
 89   
         public boolean contains(final String language) {
-  90  64 
             return this.languages.contains(language);
+  90  48 
             return this.languages.contains(language);
 91   
         }
 92   @@ -202,7 +202,7 @@ 
         @Override
 94   
         public String getAny() {
-  95  1488 
             return this.languages.iterator().next();
+  95  1116 
             return this.languages.iterator().next();
 96   
         }
 97   @@ -218,7 +218,7 @@ 
         @Override
 103   
         public boolean isEmpty() {
-  104  504212 
             return this.languages.isEmpty();
+  104  378159 
             return this.languages.isEmpty();
 105   
         }
 106   @@ -227,7 +227,7 @@ 
         @Override
 108   
         public boolean isSingleton() {
-  109  536944 
             return this.languages.size() == 1;
+  109  402708 
             return this.languages.size() == 1;
 110   
         }
 111   @@ -236,20 +236,20 @@ 
         @Override
 113   
         public LanguageSet restrictTo(final LanguageSet other) {
-  114  694968 
             if (other == NO_LANGUAGES) {
+  114  521226 
             if (other == NO_LANGUAGES) {
 115  0 
                 return other;
-  116  694968 
             } else if (other == ANY_LANGUAGE) {
-  117  478020 
                 return this;
+  116  521226 
             } else if (other == ANY_LANGUAGE) {
+  117  358515 
                 return this;
 118   
             } else {
-  119  216948 
                 final SomeLanguages sl = (SomeLanguages) other;
-  120  216948 
                 if (sl.languages.containsAll(languages)) {
-  121  8168 
                     return this;
+  119  162711 
                 final SomeLanguages sl = (SomeLanguages) other;
+  120  162711 
                 if (sl.languages.containsAll(languages)) {
+  121  6126 
                     return this;
 122   
                 } else {
-  123  208780 
                     final Set<String> ls = new HashSet<String>(this.languages);
-  124  208780 
                     ls.retainAll(sl.languages);
-  125  208780 
                     return from(ls);
+  123  156585 
                     final Set<String> ls = new HashSet<String>(this.languages);
+  124  156585 
                     ls.retainAll(sl.languages);
+  125  156585 
                     return from(ls);
 126   
                 }
 127   @@ -262,7 +262,7 @@ 
         @Override
 131   
         public String toString() {
-  132  64 
             return "Languages(" + languages.toString() + ")";
+  132  48 
             return "Languages(" + languages.toString() + ")";
 133   
         }
 134   @@ -275,13 +275,13 @@ 
     public static final String ANY = "any";
 138   
 
-  139  4 
     private static final Map<NameType, Languages> LANGUAGES = new EnumMap<NameType, Languages>(NameType.class);
+  139  3 
     private static final Map<NameType, Languages> LANGUAGES = new EnumMap<NameType, Languages>(NameType.class);
 140   
 
 141   
     static {
-  142  16 
         for (final NameType s : NameType.values()) {
-  143  12 
             LANGUAGES.put(s, getInstance(langResourceName(s)));
+  142  12 
         for (final NameType s : NameType.values()) {
+  143  9 
             LANGUAGES.put(s, getInstance(langResourceName(s)));
 144   
         }
 145   @@ -290,7 +290,7 @@ 
 
 147   
     public static Languages getInstance(final NameType nameType) {
-  148  52 
         return LANGUAGES.get(nameType);
+  148  39 
         return LANGUAGES.get(nameType);
 149   
     }
 150   @@ -299,46 +299,46 @@ 
     public static Languages getInstance(final String languagesResourceName) {
 152   
         // read languages list
-  153  16 
         final Set<String> ls = new HashSet<String>();
-  154  16 
         final InputStream langIS = Languages.class.getClassLoader().getResourceAsStream(languagesResourceName);
+  153  12 
         final Set<String> ls = new HashSet<String>();
+  154  12 
         final InputStream langIS = Languages.class.getClassLoader().getResourceAsStream(languagesResourceName);
 155   
 
-  156  16 
         if (langIS == null) {
-  157  4 
             throw new IllegalArgumentException("Unable to resolve required resource: " + languagesResourceName);
+  156  12 
         if (langIS == null) {
+  157  3 
             throw new IllegalArgumentException("Unable to resolve required resource: " + languagesResourceName);
 158   
         }
 159   
 
-  160  12 
         final Scanner lsScanner = new Scanner(langIS, ResourceConstants.ENCODING);
-  161  12 
         boolean inExtendedComment = false;
-  162  360 
         while (lsScanner.hasNextLine()) {
-  163  348 
             final String line = lsScanner.nextLine().trim();
-  164  348 
             if (inExtendedComment) {
-  165  180 
                 if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
-  166  12 
                     inExtendedComment = false;
+  160  9 
         final Scanner lsScanner = new Scanner(langIS, ResourceConstants.ENCODING);
+  161  9 
         boolean inExtendedComment = false;
+  162  270 
         while (lsScanner.hasNextLine()) {
+  163  261 
             final String line = lsScanner.nextLine().trim();
+  164  261 
             if (inExtendedComment) {
+  165  135 
                 if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
+  166  9 
                     inExtendedComment = false;
 167   
                 }
 168   
             } else {
-  169  168 
                 if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
-  170  12 
                     inExtendedComment = true;
-  171  156 
                 } else if (line.length() > 0) {
-  172  144 
                     ls.add(line);
+  169  126 
                 if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+  170  9 
                     inExtendedComment = true;
+  171  117 
                 } else if (line.length() > 0) {
+  172  108 
                     ls.add(line);
 173   
                 }
 174   
             }
-  175  348 
         }
+  175  261 
         }
 176   
 
-  177  12 
         return new Languages(Collections.unmodifiableSet(ls));
+  177  9 
         return new Languages(Collections.unmodifiableSet(ls));
 178   
     }
 179   
 
 180   
     private static String langResourceName(final NameType nameType) {
-  181  12 
         return String.format("org/apache/commons/codec/language/bm/%s_languages.txt", nameType.getName());
+  181  9 
         return String.format("org/apache/commons/codec/language/bm/%s_languages.txt", nameType.getName());
 182   
     }
 183   @@ -353,7 +353,7 @@ 
      * No languages at all.
 188   
      */
-  189  4 
     public static final LanguageSet NO_LANGUAGES = new LanguageSet() {
+  189  3 
     public static final LanguageSet NO_LANGUAGES = new LanguageSet() {
 190   
         @Override
 191   @@ -376,7 +376,7 @@ 
         @Override
 201   
         public boolean isEmpty() {
-  202  193400 
             return true;
+  202  145050 
             return true;
 203   
         }
 204   @@ -416,12 +416,12 @@ 
      * Any/all languages.
 223   
      */
-  224  4 
     public static final LanguageSet ANY_LANGUAGE = new LanguageSet() {
+  224  3 
     public static final LanguageSet ANY_LANGUAGE = new LanguageSet() {
 225   
         @Override
 226   
         public boolean contains(final String language) {
-  227  8 
             return true;
+  227  6 
             return true;
 228   
         }
 229   @@ -439,7 +439,7 @@ 
         @Override
 236   
         public boolean isEmpty() {
-  237  5736 
             return false;
+  237  4302 
             return false;
 238   
         }
 239   @@ -448,7 +448,7 @@ 
         @Override
 241   
         public boolean isSingleton() {
-  242  400 
             return false;
+  242  300 
             return false;
 243   
         }
 244   @@ -457,7 +457,7 @@ 
         @Override
 246   
         public LanguageSet restrictTo(final LanguageSet other) {
-  247  8380 
             return other;
+  247  6285 
             return other;
 248   
         }
 249   @@ -466,27 +466,27 @@ 
         @Override
 251   
         public String toString() {
-  252  8 
             return "ANY_LANGUAGE";
+  252  6 
             return "ANY_LANGUAGE";
 253   
         }
 254   
     };
 255   
 
-  256  12 
     private Languages(final Set<String> languages) {
-  257  12 
         this.languages = languages;
-  258  12 
     }
+  256  9 
     private Languages(final Set<String> languages) {
+  257  9 
         this.languages = languages;
+  258  9 
     }
 259   
 
 260   
     public Set<String> getLanguages() {
-  261  268684 
         return this.languages;
+  261  201513 
         return this.languages;
 262   
     }
 263   
 }
-
Report generated by Cobertura 1.9.4.1 on 3/30/13 2:39 AM.
+
Report generated by Cobertura 1.9.4.1 on 4/6/13 12:38 PM.
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.NameType.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.NameType.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.language.bm.NameType.html Sat Apr 6 16:40:25 2013 @@ -71,31 +71,31 @@ 
  * @version $Id: NameType.java 1429868 2013-01-07 16:08:05Z ggregory $
 27   
  */
-  28  204 
 public enum NameType {
+  28  153 
 public enum NameType {
 29   
 
 30   
     /** Ashkenazi family names */
-  31  4 
     ASHKENAZI("ash"),
+  31  3 
     ASHKENAZI("ash"),
 32   
 
 33   
     /** Generic names and words */
-  34  4 
     GENERIC("gen"),
+  34  3 
     GENERIC("gen"),
 35   
 
 36   
     /** Sephardic family names */
-  37  4 
     SEPHARDIC("sep");
+  37  3 
     SEPHARDIC("sep");
 38   
 
 39   
     private final String name;
 40   
 
-  41  12 
     NameType(final String name) {
-  42  12 
         this.name = name;
-  43  12 
     }
+  41  9 
     NameType(final String name) {
+  42  9 
         this.name = name;
+  43  9 
     }
 44   
 
 45   @@ -110,13 +110,13 @@ 
      */
 50   
     public String getName() {
-  51  928 
         return this.name;
+  51  696 
         return this.name;
 52   
     }
 53   
 }
-
Report generated by Cobertura 1.9.4.1 on 3/30/13 2:39 AM.
+
Report generated by Cobertura 1.9.4.1 on 4/6/13 12:38 PM.
\ No newline at end of file