You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2003/10/17 21:43:23 UTC

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/impl LanguageImpl.java

weaver      2003/10/17 12:43:23

  Modified:    portal/src/java/org/apache/jetspeed/om/impl
                        LanguageImpl.java
  Log:
  - defensive programming on the setKeywords() method
  
  Revision  Changes    Path
  1.2       +33 -4     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/impl/LanguageImpl.java
  
  Index: LanguageImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/impl/LanguageImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LanguageImpl.java	10 Oct 2003 05:12:09 -0000	1.1
  +++ LanguageImpl.java	17 Oct 2003 19:43:23 -0000	1.2
  @@ -54,16 +54,17 @@
   package org.apache.jetspeed.om.impl;
   
   import java.io.Serializable;
  +import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Iterator;
   import java.util.Locale;
   import java.util.ResourceBundle;
  +import java.util.StringTokenizer;
   
   import org.apache.jetspeed.om.common.MutableLanguage;
   import org.apache.jetspeed.util.HashCodeBuilder;
   import org.apache.pluto.om.common.Language;
   
  -
   /**
    * 
    * LanguageImpl
  @@ -138,7 +139,13 @@
        */
       public Iterator getKeywords()
       {
  -        return keywords.iterator();
  +        if (keywords != null)
  +        {
  +            return keywords.iterator();
  +        }
  +
  +        return null;
  +
       }
   
       /**
  @@ -205,6 +212,28 @@
           this.keywords = keywords;
       }
   
  -
  +    /**
  +     * 
  +     * <p>
  +     * setKeywords
  +     * </p>
  +     * 
  +     * A comma delimited list of keywords
  +     * 
  +     * @param keywords
  +     *
  +     */
  +    public void setKeywords(String keywordStr)
  +    {
  +        if (keywords == null)
  +        {
  +            keywords = new ArrayList();
  +        }
  +        StringTokenizer tok = new StringTokenizer(keywordStr, ",");
  +        while (tok.hasMoreTokens())
  +        {
  +            keywords.add(tok.nextToken());
  +        }
  +    }
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org