db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/metadata ClassDescriptor.java
Date Mon, 09 Dec 2002 08:16:14 GMT
arminw      2002/12/09 00:16:14

  Modified:    src/java/org/apache/ojb/broker/metadata ClassDescriptor.java
  Log:
  repair #ifdef
  
  Revision  Changes    Path
  1.46      +10 -12    jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
  
  Index: ClassDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- ClassDescriptor.java	6 Dec 2002 16:29:35 -0000	1.45
  +++ ClassDescriptor.java	9 Dec 2002 08:16:14 -0000	1.46
  @@ -57,7 +57,6 @@
   import java.io.Serializable;
   import java.lang.reflect.Constructor;
   import java.lang.reflect.Modifier;
  -import java.lang.reflect.Proxy;
   import java.sql.Timestamp;
   import java.util.ArrayList;
   import java.util.Arrays;
  @@ -78,6 +77,9 @@
   import org.apache.ojb.broker.accesslayer.RowReaderDefaultImpl;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  +
  +//#ifdef JDK13
  +import java.lang.reflect.Proxy;
   //#else
   /*
   import com.develop.java.lang.reflect.Proxy;
  @@ -871,7 +873,7 @@
        * returns an Array with an Objects PK VALUES, with any java-to-sql
        * FieldConversion applied. If the Object is a Proxy or a VirtualProxy NO
        * conversion is necessary.
  -     * 
  +     *
        * @param objectOrProxy
        * @return Object[]
        * @throws PersistenceBrokerException
  @@ -885,7 +887,7 @@
        * returns an Array with an Objects PK VALUES if convertToSql is true, any
        * associated java-to-sql conversions are applied. If the Object is a Proxy
        * or a VirtualProxy NO conversion is necessary.
  -     * 
  +     *
        * @param objectOrProxy
        * @param convertToSql
        * @return Object[]
  @@ -904,7 +906,7 @@
           else
           {
               return getKeyValuesForObject(objectOrProxy,convertToSql);
  -        }    
  +        }
       }
   
       /**
  @@ -1353,7 +1355,7 @@
       	if (null == m_repository)
       	{
       		// todo: I don't know if this is always the correct repository!
  -    		m_repository = DescriptorRepository.getDefaultInstance();	
  +    		m_repository = DescriptorRepository.getDefaultInstance();
       	}
           return m_repository;
       }
  @@ -1776,7 +1778,7 @@
        * Returns acceptLocks.
        * @return boolean
        */
  -    public boolean isAcceptLocks() 
  +    public boolean isAcceptLocks()
       {
           return acceptLocks;
       }
  @@ -1785,12 +1787,8 @@
        * Sets acceptLocks.
        * @param m_acceptLocks The m_acceptLocks to set
        */
  -    public void setAcceptLocks(boolean acceptLocks) 
  +    public void setAcceptLocks(boolean acceptLocks)
       {
           this.acceptLocks = acceptLocks;
       }
  -
  -    
  -
  -
   }
  
  
  

Mime
View raw message