cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/ojb ObjectIDtoLongFieldConversion.java

[weaver]

weaver      2003/08/01 13:11:48

  Modified:    portal/src/java/org/apache/jetspeed/util/ojb
                        ObjectIDtoLongFieldConversion.java
  Log:
  Removed my ObjectIDImpl and replaced its previous usage with JetspeedObjectID
  
  Revision  Changes    Path
  1.2       +8 -9      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java
  
  Index: ObjectIDtoLongFieldConversion.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ObjectIDtoLongFieldConversion.java        28 Jul 2003 23:47:53 -0000      1.1
  +++ ObjectIDtoLongFieldConversion.java        1 Aug 2003 20:11:47 -0000       1.2
  @@ -53,7 +53,7 @@
    */
   package org.apache.jetspeed.util.ojb;
   
  -import org.apache.jetspeed.om.common.ObjectIDImpl;
  +import org.apache.jetspeed.util.JetspeedObjectID;
   import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
   import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
   
  @@ -73,12 +73,12 @@
        * @see 
org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
        */
       public Object javaToSql(Object arg0) throws ConversionException
  -    {        
  -        if (arg0 instanceof ObjectIDImpl)
  +    {
  +        if (arg0 instanceof JetspeedObjectID)
           {
  -            ObjectIDImpl oid = (ObjectIDImpl) arg0;
  -            Long longValue = new Long(oid.getValue().toString());
  -            return longValue;
  +            JetspeedObjectID oid = (JetspeedObjectID) arg0;
  +
  +            return new Integer(oid.intValue());
           }
           else
           {
  @@ -94,9 +94,8 @@
       {
           if (arg0 instanceof Number)
           {
  -            ObjectIDImpl oid = new ObjectIDImpl();
  -            oid.setValue(((Number) arg0).longValue());
  -            return oid;
  +            
  +            return new JetspeedObjectID(((Number)arg0).intValue());
           }
           else
           {
  
  
  

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