You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2003/05/02 20:11:49 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer RowReaderDefaultImpl.java

brj         2003/05/02 11:11:49

  Modified:    src/java/org/apache/ojb/broker/accesslayer
                        RowReaderDefaultImpl.java
  Log:
  minor refactoring
  to get rid of warnings
  
  Revision  Changes    Path
  1.19      +14 -14    db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReaderDefaultImpl.java
  
  Index: RowReaderDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReaderDefaultImpl.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- RowReaderDefaultImpl.java	2 May 2003 12:24:32 -0000	1.18
  +++ RowReaderDefaultImpl.java	2 May 2003 18:11:49 -0000	1.19
  @@ -75,12 +75,12 @@
   
   public class RowReaderDefaultImpl implements RowReader
   {
  -    private ClassDescriptor cld;
  +    private ClassDescriptor m_cld;
   
   
       public RowReaderDefaultImpl(ClassDescriptor cld)
       {
  -        this.cld = cld;
  +        this.m_cld = cld;
       }
   
       /**
  @@ -139,17 +139,17 @@
       {
           FieldDescriptor[] fields = null;
   
  -        if (cld.getSuperClass() != null)
  +        if (m_cld.getSuperClass() != null)
           {
               /**
                * treeder
                * append super class fields if exist
                */
  -            fields = cld.getFieldDescriptorsInHeirarchy();
  +            fields = m_cld.getFieldDescriptorsInHeirarchy();
           }
           else
           {
  -            fields = cld.getRepository().getFieldDescriptorsForMultiMappedTable(cld);
  +            fields = m_cld.getRepository().getFieldDescriptorsForMultiMappedTable(m_cld);
   
           }
           int size = fields.length;
  @@ -178,10 +178,10 @@
       protected ClassDescriptor selectClassDescriptor(Map row) throws PersistenceBrokerException
       {
           // check if there is an attribute which tells us which concrete class is to be instantiated
  -        FieldDescriptor concreteClassFD = cld.getFieldDescriptorByName(ClassDescriptor.OJB_CONCRETE_CLASS);
  +        FieldDescriptor concreteClassFD = m_cld.getFieldDescriptorByName(ClassDescriptor.OJB_CONCRETE_CLASS);
   
           if (concreteClassFD == null)
  -            return cld;
  +            return m_cld;
           else
           {
               try
  @@ -196,10 +196,10 @@
                   {
                       concreteClass = concreteClass.trim();
                   }
  -                ClassDescriptor result = cld.getRepository().getDescriptorFor(concreteClass);
  +                ClassDescriptor result = m_cld.getRepository().getDescriptorFor(concreteClass);
                   if (result == null)
                   {
  -                    result = cld;
  +                    result = m_cld;
                   }
                   return result;
               }
  @@ -248,7 +248,7 @@
           }
           catch (Exception ex)
           {
  -            throw new PersistenceBrokerException("Unable to build object instance (MAYBE you don't have a constructor available):" + cld.getClassOfObject(), ex);
  +            throw new PersistenceBrokerException("Unable to build object instance (MAYBE you don't have a constructor available):" + m_cld.getClassOfObject(), ex);
           }
       }
   
  @@ -272,7 +272,7 @@
       {
           try
           {
  -            FieldDescriptor[] pkFields = cld.getPkFields();
  +            FieldDescriptor[] pkFields = m_cld.getPkFields();
               for (int i = 0; i < pkFields.length; i++)
               {
                   FieldDescriptor fmd = pkFields[i];
  @@ -289,12 +289,12 @@
   
       public void setClassDescriptor(ClassDescriptor cld)
       {
  -        this.cld = cld;
  +        this.m_cld = cld;
       }
   
       public ClassDescriptor getClassDescriptor()
       {
  -        return cld;
  +        return m_cld;
       }
       
       /**