jsalvata    2003/01/12 16:19:21

  Modified:    src/core/org/apache/jmeter/testelement
                        AbstractTestElement.java
  Log:
  Reformatted.
  
  Revision  Changes    Path
  1.4       +349 -329  
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
  
  Index: AbstractTestElement.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractTestElement.java  29 Aug 2002 18:17:40 -0000      1.3
  +++ AbstractTestElement.java  13 Jan 2003 00:19:20 -0000      1.4
  @@ -18,332 +18,352 @@
   
   public abstract class AbstractTestElement implements TestElement,Serializable
   {
  -     private Map testInfo = new HashMap();
  -     transient private static Logger log = 
Hierarchy.getDefaultHierarchy().getLoggerFor(
  -                     "jmeter.elements");
  -
  -     /****************************************
  -      * !ToDo (Method description)
  -      *
  -      *@return   !ToDo (Return description)
  -      ***************************************/
  -     public Object clone()
  -     {
  -             try
  -             {
  -                     TestElement newObject = 
(TestElement)this.getClass().newInstance();
  -                     configureClone(newObject);
  -                     return newObject;
  -             }
  -             catch(Exception e)
  -             {
  -                     log.error("",e);
  -             }
  -             return null;
  -     }
  -
  -     public void removeProperty(String key)
  -     {
  -             testInfo.remove(key);
  -     }
  -
  -     public boolean equals(Object o)
  -     {
  -             if(o instanceof AbstractTestElement)
  -             {
  -                     return ((AbstractTestElement)o).testInfo.equals(testInfo);
  -             }
  -             else
  -             {
  -                     return false;
  -             }
  -     }
  -
  -     /****************************************
  -      * !ToDo
  -      *
  -      *@param el  !ToDo
  -      ***************************************/
  -     public void addTestElement(TestElement el)
  -     {
  -             if(el.getClass().equals(this.getClass()))
  -             {
  -                     mergeIn(el);
  -             }
  -     }
  -
  -     /****************************************
  -      * !ToDo (Method description)
  -      *
  -      *@param name  !ToDo (Parameter description)
  -      ***************************************/
  -     public void setName(String name)
  -     {
  -             setProperty(TestElement.NAME, name);
  -     }
  -
  -     /****************************************
  -      * !ToDoo (Method description)
  -      *
  -      *@return   !ToDo (Return description)
  -      ***************************************/
  -     public String getName()
  -     {
  -             return (String)getProperty(TestElement.NAME);
  -     }
  -
  -     /****************************************
  -      * !ToDo (Method description)
  -      *
  -      *@param key   !ToDo (Parameter description)
  -      *@param prop  !ToDo (Parameter description)
  -      ***************************************/
  -     public void setProperty(String key, Object prop)
  -     {
  -             testInfo.put(key, prop);
  -     }
  -
  -     /****************************************
  -      * !ToDoo (Method description)
  -      *
  -      *@param key  !ToDo (Parameter description)
  -      *@return     !ToDo (Return description)
  -      ***************************************/
  -     public Object getProperty(String key)
  -     {
  -             return testInfo.get(key);
  -     }
  -
  -     /****************************************
  -      * !ToDoo (Method description)
  -      *
  -      *@return   !ToDo (Return description)
  -      ***************************************/
  -     public Collection getPropertyNames()
  -     {
  -             return testInfo.keySet();
  -     }
  -
  -     /****************************************
  -      * !ToDo (Method description)
  -      *
  -      *@param newObject  !ToDo (Parameter description)
  -      ***************************************/
  -     protected void configureClone(TestElement newObject)
  -     {
  -             Iterator iter = getPropertyNames().iterator();
  -             while(iter.hasNext())
  -             {
  -                     String key = (String)iter.next();
  -                     Object value = getProperty(key);
  -                     if(value instanceof TestElement)
  -                     {
  -                             newObject.setProperty(key, 
((TestElement)value).clone());
  -                     }
  -                     else if(value instanceof Collection)
  -                     {
  -                             try {
  -                                     
newObject.setProperty(key,cloneCollection(value));
  -                             } catch(Exception e) {
  -                                     log.error("",e);
  -                             }
  -                     }
  -                     else
  -                     {
  -                             newObject.setProperty(key, value);
  -                     }
  -             }
  -     }
  -
  -     protected Collection cloneCollection(Object value) throws 
InstantiationException,
  -                     IllegalAccessException,ClassNotFoundException
  -     {
  -             Iterator collIter = ((Collection)value).iterator();
  -             Collection newColl = (Collection)value.getClass().newInstance();
  -             while(collIter.hasNext())
  -             {
  -                     Object val = collIter.next();
  -                     if(val instanceof TestElement)
  -                     {
  -                             val = ((TestElement)val).clone();
  -                     }
  -                     else if(val instanceof Collection)
  -                     {
  -                             try {
  -                                     val = cloneCollection(val);
  -                             } catch(Exception e) {
  -                                     continue;
  -                             }
  -                     }
  -                     newColl.add(val);
  -             }
  -             return newColl;
  -     }
  -
  -     private long getLongValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return (long)0;
  -             } else if (bound instanceof Long)
  -             {
  -                     return ((Long) bound).longValue();
  -             } else
  -             {
  -                     return Long.parseLong((String) bound);
  -             }
  -     }
  -
  -     private float getFloatValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return (float)0;
  -             } else if (bound instanceof Float)
  -             {
  -                     return ((Float) bound).floatValue();
  -             } else
  -             {
  -                     return Float.parseFloat((String) bound);
  -             }
  -     }
  -
  -     private double getDoubleValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return (double)0;
  -             } else if (bound instanceof Double)
  -             {
  -                     return ((Double) bound).doubleValue();
  -             } else
  -             {
  -                     return Double.parseDouble((String) bound);
  -             }
  -     }
  -
  -     private String getStringValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return "";
  -             } else return bound.toString();
  -     }
  -
  -     private int getIntValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return (int)0;
  -             } else if (bound instanceof Integer)
  -             {
  -                     return ((Integer) bound).intValue();
  -             } else
  -             {
  -                     try
  -                     {
  -                             return Integer.parseInt((String) bound);
  -                     }
  -                     catch(NumberFormatException e)
  -                     {
  -                             return 0;
  -                     }
  -             }
  -     }
  -
  -     private boolean getBooleanValue(Object bound)
  -     {
  -             if (bound == null)
  -             {
  -                     return false;
  -             } else if (bound instanceof Boolean)
  -             {
  -                     return ((Boolean) bound).booleanValue();
  -             }
  -             else
  -             {
  -                     return new Boolean((String) bound).booleanValue();
  -             }
  -     }
  -
  -     public int getPropertyAsInt(String key)
  -     {
  -             return getIntValue(getProperty(key));
  -     }
  -
  -     public boolean getPropertyAsBoolean(String key)
  -     {
  -             return getBooleanValue(getProperty(key));
  -     }
  -
  -     public float getPropertyAsFloat(String key)
  -     {
  -             return getFloatValue(getProperty(key));
  -     }
  -
  -     public long getPropertyAsLong(String key)
  -     {
  -             return getLongValue(getProperty(key));
  -     }
  -
  -     public double getPropertyAsDouble(String key)
  -     {
  -             return getDoubleValue(getProperty(key));
  -     }
  -
  -     public String getPropertyAsString(String key)
  -     {
  -             return getStringValue(getProperty(key));
  -     }
  -
  -     /****************************************
  -      * !ToDo (Method description)
  -      *
  -      *@param element  !ToDo (Parameter description)
  -      ***************************************/
  -     protected void mergeIn(TestElement element)
  -     {
  -             Iterator iter = element.getPropertyNames().iterator();
  -             while(iter.hasNext())
  -             {
  -                     String key = (String)iter.next();
  -                     Object value = element.getProperty(key);
  -                     if(getProperty(key) == null || getProperty(key).equals(""))
  -                     {
  -                             setProperty(key, value);
  -                             continue;
  -                     }
  -                     if(value instanceof TestElement)
  -                     {
  -                             if(getProperty(key) == null)
  -                             {
  -                                     setProperty(key,value);
  -                             }
  -                             else if(getProperty(key) instanceof TestElement)
  -                             {
  -                                     
((TestElement)getProperty(key)).addTestElement((TestElement)value);
  -                             }
  -                     }
  -                     else if(value instanceof Collection)
  -                     {
  -                             Iterator iter2 = ((Collection)value).iterator();
  -                             Collection localCollection = 
(Collection)getProperty(key);
  -                             if(localCollection == null)
  -                             {
  -                                     setProperty(key,value);
  -                             }
  -                             else
  -                             {
  -                                     while(iter2.hasNext())
  -                                     {
  -                                             Object item = iter2.next();
  -                                             if(!localCollection.contains(item))
  -                                             {
  -                                                     localCollection.add(item);
  -                                             }
  -                                     }
  -                             }
  -                     }
  -             }
  -     }
  +    private Map testInfo = new HashMap();
  +    transient private static Logger log =
  +            Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.elements");
  +
  +    /****************************************
  +     * !ToDo (Method description)
  +     *
  +     *@return   !ToDo (Return description)
  +     ***************************************/
  +    public Object clone()
  +    {
  +        try
  +        {
  +            TestElement newObject = (TestElement)this.getClass().newInstance();
  +            configureClone(newObject);
  +            return newObject;
  +        }
  +        catch(Exception e)
  +        {
  +            log.error("",e);
  +        }
  +        return null;
  +    }
  +
  +    public void removeProperty(String key)
  +    {
  +        testInfo.remove(key);
  +    }
  +
  +    public boolean equals(Object o)
  +    {
  +        if(o instanceof AbstractTestElement)
  +        {
  +            return ((AbstractTestElement)o).testInfo.equals(testInfo);
  +        }
  +        else
  +        {
  +            return false;
  +        }
  +    }
  +
  +    /****************************************
  +     * !ToDo
  +     *
  +     *@param el  !ToDo
  +     ***************************************/
  +    public void addTestElement(TestElement el)
  +    {
  +        if(el.getClass().equals(this.getClass()))
  +        {
  +            mergeIn(el);
  +        }
  +    }
  +
  +    /****************************************
  +     * !ToDo (Method description)
  +     *
  +     *@param name  !ToDo (Parameter description)
  +     ***************************************/
  +    public void setName(String name)
  +    {
  +        setProperty(TestElement.NAME, name);
  +    }
  +
  +    /****************************************
  +     * !ToDoo (Method description)
  +     *
  +     *@return   !ToDo (Return description)
  +     ***************************************/
  +    public String getName()
  +    {
  +        return (String)getProperty(TestElement.NAME);
  +    }
  +
  +    /****************************************
  +     * !ToDo (Method description)
  +     *
  +     *@param key   !ToDo (Parameter description)
  +     *@param prop  !ToDo (Parameter description)
  +     ***************************************/
  +    public void setProperty(String key, Object prop)
  +    {
  +        testInfo.put(key, prop);
  +    }
  +
  +    /****************************************
  +     * !ToDoo (Method description)
  +     *
  +     *@param key  !ToDo (Parameter description)
  +     *@return     !ToDo (Return description)
  +     ***************************************/
  +    public Object getProperty(String key)
  +    {
  +        return testInfo.get(key);
  +    }
  +
  +    /****************************************
  +     * !ToDoo (Method description)
  +     *
  +     *@return   !ToDo (Return description)
  +     ***************************************/
  +    public Collection getPropertyNames()
  +    {
  +        return testInfo.keySet();
  +    }
  +
  +    /****************************************
  +     * !ToDo (Method description)
  +     *
  +     *@param newObject  !ToDo (Parameter description)
  +     ***************************************/
  +    protected void configureClone(TestElement newObject)
  +    {
  +        Iterator iter = getPropertyNames().iterator();
  +        while(iter.hasNext())
  +        {
  +            String key = (String)iter.next();
  +            Object value = getProperty(key);
  +            if(value instanceof TestElement)
  +            {
  +                newObject.setProperty(key, ((TestElement)value).clone());
  +            }
  +            else if(value instanceof Collection)
  +            {
  +                try
  +                {
  +                    newObject.setProperty(key,cloneCollection(value));
  +                }
  +                catch(Exception e)
  +                {
  +                    log.error("",e);
  +                }
  +            }
  +            else
  +            {
  +                newObject.setProperty(key, value);
  +            }
  +        }
  +    }
  +
  +    protected Collection cloneCollection(Object value)
  +            throws InstantiationException,
  +                   IllegalAccessException,
  +                   ClassNotFoundException
  +    {
  +        Iterator collIter = ((Collection)value).iterator();
  +        Collection newColl = (Collection)value.getClass().newInstance();
  +        while(collIter.hasNext())
  +        {
  +            Object val = collIter.next();
  +            if(val instanceof TestElement)
  +            {
  +                val = ((TestElement)val).clone();
  +            }
  +            else if(val instanceof Collection)
  +            {
  +                try
  +                {
  +                    val = cloneCollection(val);
  +                }
  +                catch(Exception e)
  +                {
  +                    continue;
  +                }
  +            }
  +            newColl.add(val);
  +        }
  +        return newColl;
  +    }
  +
  +    private long getLongValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +            return (long)0;
  +        }
  +        else if (bound instanceof Long)
  +        {
  +            return ((Long) bound).longValue();
  +        }
  +        else
  +        {
  +            return Long.parseLong((String) bound);
  +        }
  +    }
  +
  +    private float getFloatValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +                return (float)0;
  +        }
  +        else if (bound instanceof Float)
  +        {
  +            return ((Float) bound).floatValue();
  +        }
  +        else
  +        {
  +            return Float.parseFloat((String) bound);
  +        }
  +    }
  +
  +    private double getDoubleValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +            return (double)0;
  +        }
  +        else if (bound instanceof Double)
  +        {
  +            return ((Double) bound).doubleValue();
  +        }
  +        else
  +        {
  +            return Double.parseDouble((String) bound);
  +        }
  +    }
  +
  +    private String getStringValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +            return "";
  +        }
  +        else {
  +            return bound.toString();
  +        }
  +    }
  +
  +    private int getIntValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +            return (int)0;
  +        }
  +        else if (bound instanceof Integer)
  +        {
  +            return ((Integer) bound).intValue();
  +        }
  +        else
  +        {
  +            try
  +            {
  +                return Integer.parseInt((String) bound);
  +            }
  +            catch(NumberFormatException e)
  +            {
  +                return 0;
  +            }
  +        }
  +    }
  +
  +    private boolean getBooleanValue(Object bound)
  +    {
  +        if (bound == null)
  +        {
  +            return false;
  +        }
  +        else if (bound instanceof Boolean)
  +        {
  +            return ((Boolean) bound).booleanValue();
  +        }
  +        else
  +        {
  +            return new Boolean((String) bound).booleanValue();
  +        }
  +    }
  +
  +    public int getPropertyAsInt(String key)
  +    {
  +        return getIntValue(getProperty(key));
  +    }
  +
  +    public boolean getPropertyAsBoolean(String key)
  +    {
  +        return getBooleanValue(getProperty(key));
  +    }
  +
  +    public float getPropertyAsFloat(String key)
  +    {
  +        return getFloatValue(getProperty(key));
  +    }
  +
  +    public long getPropertyAsLong(String key)
  +    {
  +        return getLongValue(getProperty(key));
  +    }
  +
  +    public double getPropertyAsDouble(String key)
  +    {
  +        return getDoubleValue(getProperty(key));
  +    }
  +
  +    public String getPropertyAsString(String key)
  +    {
  +        return getStringValue(getProperty(key));
  +    }
  +
  +    /****************************************
  +     * !ToDo (Method description)
  +     *
  +     *@param element  !ToDo (Parameter description)
  +     ***************************************/
  +    protected void mergeIn(TestElement element)
  +    {
  +        Iterator iter = element.getPropertyNames().iterator();
  +        while(iter.hasNext())
  +        {
  +            String key = (String)iter.next();
  +            Object value = element.getProperty(key);
  +            if(getProperty(key) == null || getProperty(key).equals(""))
  +            {
  +                setProperty(key, value);
  +                continue;
  +            }
  +            if(value instanceof TestElement)
  +            {
  +                if(getProperty(key) == null)
  +                {
  +                    setProperty(key,value);
  +                }
  +                else if(getProperty(key) instanceof TestElement)
  +                {
  +                    
((TestElement)getProperty(key)).addTestElement((TestElement)value);
  +                }
  +            }
  +            else if(value instanceof Collection)
  +            {
  +                Iterator iter2 = ((Collection)value).iterator();
  +                Collection localCollection = (Collection)getProperty(key);
  +                if(localCollection == null)
  +                {
  +                    setProperty(key,value);
  +                }
  +                else
  +                {
  +                    while(iter2.hasNext())
  +                    {
  +                        Object item = iter2.next();
  +                        if(!localCollection.contains(item))
  +                        {
  +                            localCollection.add(item);
  +                        }
  +                    }
  +                }
  +            }
  +        }
  +    }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to