You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/20 17:50:15 UTC

[commons-codec] branch master updated: Add elements of a collections without a loop.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/master by this push:
     new c4e813f  Add elements of a collections without a loop.
c4e813f is described below

commit c4e813f8d822a09cba989abbd2ddc448a0d9ae86
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 20 12:50:10 2020 -0500

    Add elements of a collections without a loop.
---
 .../apache/commons/codec/language/bm/Languages.java  | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/language/bm/Languages.java b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
index 395f004..999acb9 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Languages.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
@@ -123,14 +123,14 @@ public class Languages {
             } else if (other == ANY_LANGUAGE) {
                 return this;
             } else {
-                final SomeLanguages sl = (SomeLanguages) other;
-                final Set<String> ls = new HashSet<>(Math.min(languages.size(), sl.languages.size()));
+                final SomeLanguages someLanguages = (SomeLanguages) other;
+                final Set<String> set = new HashSet<>(Math.min(languages.size(), someLanguages.languages.size()));
                 for (final String lang : languages) {
-                    if (sl.languages.contains(lang)) {
-                        ls.add(lang);
+                    if (someLanguages.languages.contains(lang)) {
+                        set.add(lang);
                     }
                 }
-                return from(ls);
+                return from(set);
             }
         }
 
@@ -141,12 +141,10 @@ public class Languages {
             } else if (other == ANY_LANGUAGE) {
                 return other;
             } else {
-                final SomeLanguages sl = (SomeLanguages) other;
-                final Set<String> ls = new HashSet<>(languages);
-                for (final String lang : sl.languages) {
-                    ls.add(lang);
-                }
-                return from(ls);
+                final SomeLanguages someLanguages = (SomeLanguages) other;
+                final Set<String> set = new HashSet<>(languages);
+                set.addAll(someLanguages.languages);
+                return from(set);
             }
         }