[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jmx/src/main/org/jboss/mx/util MetaDataUtil.java
From:       Adrian Brock <ejort () users ! sourceforge ! net>
Date:       2003-01-31 16:24:08
[Download RAW message or body]

  User: ejort   
  Date: 03/01/31 08:24:05

  Modified:    src/main/org/jboss/mx/util MetaDataUtil.java
  Log:
  Improve the metadata checking, use a hashset for the reserved words
  
  Revision  Changes    Path
  1.2       +61 -58    jmx/src/main/org/jboss/mx/util/MetaDataUtil.java
  
  Index: MetaDataUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/util/MetaDataUtil.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MetaDataUtil.java	20 Jan 2003 17:20:22 -0000	1.1
  +++ MetaDataUtil.java	31 Jan 2003 16:24:02 -0000	1.2
  @@ -6,6 +6,8 @@
    */
   package org.jboss.mx.util;
   
  +import java.util.HashSet;
  +
   /**
    * Utilities for handling meta data
    * 
  @@ -14,7 +16,7 @@
    * @author  <a href="mailto:jason@planet57.com">Jason Dillon</a>
    * @author <a href="Scott.Stark@jboss.org">Scott Stark</a>
    * @author  <a href="mailto:Adrian.Brock@HappeningTimes.com">Adrian Brock</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public final class MetaDataUtil
   {
  @@ -30,61 +32,63 @@
      public static final String SHORT_TYPE_NAME = Short.TYPE.getName();
      public static final String VOID_TYPE_NAME = Void.TYPE.getName();
   
  -   private static final String[] reserved =
  +   private static final HashSet reserved = new HashSet();
  +
  +   static
      {
  -      "assert", // REVIEW: Should we check the java version?
  -      "abstract",
  -      "boolean",
  -      "break",
  -      "byte",
  -      "case",
  -      "catch",
  -      "char",
  -      "class",
  -      "const",
  -      "continue",
  -      "default",
  -      "do",
  -      "double",
  -      "else",
  -      "extends",
  -      "false",
  -      "final",
  -      "finally",
  -      "float",
  -      "for",
  -      "goto",
  -      "if",
  -      "implements",
  -      "import",
  -      "instanceof",
  -      "int",
  -      "interface",
  -      "long",
  -      "native",
  -      "new",
  -      "null",
  -      "package",
  -      "private",
  -      "protected",
  -      "public",
  -      "return",
  -      "short",
  -      "static",
  -      "strictfp",
  -      "super",
  -      "switch",
  -      "synchronized",
  -      "this",
  -      "throw",
  -      "throws",
  -      "transient",
  -      "true",
  -      "try",
  -      "void",
  -      "volatile",
  -      "while"
  -   };
  +      reserved.add("assert");
  +      reserved.add("abstract");
  +      reserved.add("boolean");
  +      reserved.add("break");
  +      reserved.add("byte");
  +      reserved.add("case");
  +      reserved.add("catch");
  +      reserved.add("char");
  +      reserved.add("class");
  +      reserved.add("const");
  +      reserved.add("continue");
  +      reserved.add("default");
  +      reserved.add("do");
  +      reserved.add("double");
  +      reserved.add("else");
  +      reserved.add("extends");
  +      reserved.add("false");
  +      reserved.add("final");
  +      reserved.add("finally");
  +      reserved.add("float");
  +      reserved.add("for");
  +      reserved.add("goto");
  +      reserved.add("if");
  +      reserved.add("implements");
  +      reserved.add("import");
  +      reserved.add("instanceof");
  +      reserved.add("int");
  +      reserved.add("interface");
  +      reserved.add("long");
  +      reserved.add("native");
  +      reserved.add("new");
  +      reserved.add("null");
  +      reserved.add("package");
  +      reserved.add("private");
  +      reserved.add("protected");
  +      reserved.add("public");
  +      reserved.add("return");
  +      reserved.add("short");
  +      reserved.add("static");
  +      reserved.add("strictfp");
  +      reserved.add("super");
  +      reserved.add("switch");
  +      reserved.add("synchronized");
  +      reserved.add("this");
  +      reserved.add("throw");
  +      reserved.add("throws");
  +      reserved.add("transient");
  +      reserved.add("true");
  +      reserved.add("try");
  +      reserved.add("void");
  +      reserved.add("volatile");
  +      reserved.add("while");
  +   }
   
      // Static --------------------------------------------------------
   
  @@ -113,9 +117,8 @@
               return false;
         }
   
  -      for (int i = 0; i < reserved.length; ++i)
  -         if (reserved[i].equals(string))
  -            return false;
  +        if (reserved.contains(string))
  +           return false;
   
         // Yippee!
         return true;
  
  
  


-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]