svn commit: r568327 - in /openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa: kernel/StateManagerImpl.java meta/FieldMetaData.java util/ApplicationIds.java

[pcl]

Author: pcl
Date: Tue Aug 21 16:28:33 2007
New Revision: 568327

URL: http://svn.apache.org/viewvc?rev=568327&view=rev
Log:
Changed oddly-named methods. Looks like the result of a bum refactoring.

Modified:
    
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
    
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
    
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java

Modified: 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=568327&r1=568326&r2=568327&view=diff
==============================================================================
--- 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 (original)
+++ 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 Tue Aug 21 16:28:33 2007
@@ -580,7 +580,7 @@
         
         // Throw exception if field already has a value assigned.
         // @GeneratedValue overrides POJO initial values and setter methods
-        if (!isDefaultValue(field) && !fmd.is_generated())
+        if (!isDefaultValue(field) && !fmd.isValueGenerated())
             throw new InvalidStateException(_loc.get(
                     "existing-value-override-excep", fmd.getFullName(false)));
 
@@ -591,7 +591,7 @@
 
         // for other fields just assign the field or flush if needed
         if (_broker.getStoreManager().assignField(this, field, preFlushing)) {
-            fmd.set_generated(true);
+            fmd.setValueGenerated(true);
             return true;
         }
         if (!preFlushing)

Modified: 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java?rev=568327&r1=568326&r2=568327&view=diff
==============================================================================
--- 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
 (original)
+++ 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
 Tue Aug 21 16:28:33 2007
@@ -2051,11 +2051,11 @@
         }
     }
 
-    public boolean is_generated() {
+    public boolean isValueGenerated() {
         return _generated;
     }
 
-    public void set_generated(boolean _generated) {
-        this._generated = _generated;
+    public void setValueGenerated(boolean generated) {
+        this._generated = generated;
     }
 }

Modified: 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java?rev=568327&r1=568326&r2=568327&view=diff
==============================================================================
--- 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
 (original)
+++ 
openjpa/branches/1.0.0/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
 Tue Aug 21 16:28:33 2007
@@ -448,7 +448,7 @@
                                     .getFullName(false)));
                 // Assign the generated value
                 if (store.assignField(sm, pks[i].getIndex(), preFlush))
-                    pks[i].set_generated(true);
+                    pks[i].setValueGenerated(true);
                 else
                     return false;
             }