User: juhalindfors
  Date: 02/03/13 06:44:53

  Modified:    src/main/org/jboss/mx/loading MBeanElement.java
                        MLetParser.java
  Log:
  merge from 1.0 branch up to RelMX_1_0_0_3 build
  
  Revision  Changes    Path
  1.2       +27 -5     jmx/src/main/org/jboss/mx/loading/MBeanElement.java
  
  Index: MBeanElement.java
  ===================================================================
  RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/loading/MBeanElement.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MBeanElement.java 15 Feb 2002 12:26:23 -0000      1.1
  +++ MBeanElement.java 13 Mar 2002 14:44:53 -0000      1.2
  @@ -59,9 +59,14 @@
      private ArrayList versions = new ArrayList();
      
      /**
  -    * MBean constructor arguments.
  +    * MBean constructor argument types.
       */
  -   private ArrayList args     = new ArrayList();
  +   private ArrayList argTypes    = new ArrayList();
  +   
  +   /**
  +    * MBean constructor argument values.
  +    */
  +   private ArrayList argValues   = new ArrayList();
      
      
      // Public --------------------------------------------------------
  @@ -152,6 +157,12 @@
         this.name = trim(name);
      }
      
  +   /**
  +    * Sets the code base for an MLET entry. The codebase is trimmed of quotes (") 
and
  +    * additional equals (=) sign.
  +    *
  +    * @param   url   url string pointing to the codebase
  +    */
      public void setCodebase(String url)
      {
         this.codebase = trim(url);
  @@ -175,9 +186,20 @@
            versions.add(tokenizer.nextToken());
      }
      
  -   public void addArg(String name, String value)
  +   public void addArg(String type, String value)
  +   {
  +      argTypes.add(trim(type));
  +      argValues.add(trim(value));
  +   }
  +   
  +   public String[] getConstructorTypes()
  +   {
  +      return (String[])argTypes.toArray(new String[0]);
  +   }
  +   
  +   public String[] getConstructorValues()
      {
  -      throw new Error("NYI");  
  +      return (String[])argValues.toArray(new String[0]);
      }
      
      // Private -------------------------------------------------------
  
  
  
  1.3       +3 -4      jmx/src/main/org/jboss/mx/loading/MLetParser.java
  
  Index: MLetParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/loading/MLetParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MLetParser.java   15 Feb 2002 16:48:34 -0000      1.2
  +++ MLetParser.java   13 Mar 2002 14:44:53 -0000      1.3
  @@ -176,7 +176,7 @@
                        if (!tokenizer.nextToken().equals("TYPE"))
                           continue;
                           
  -                     String name = tokenizer.nextToken();
  +                     String type = tokenizer.nextToken();
                        
                        // if fourth token is not VALUE then skip the attribute
                        if (!tokenizer.nextToken().equals("VALUE"))
  @@ -186,12 +186,11 @@
                        
                        // element is non-null if we're within <MLET> </MLET> tags
                        if (element != null)
  -                        element.addArg(name, value);
  +                        element.addArg(type, value);
                     }
                     catch (NoSuchElementException e)
                     {
                        // malformed ARG tag means the MBean can't be instantiated
  -                     // bogus class name will fail in createMBean
                        element = null;
                        
                        // FIXME: log this
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to