Author: arminw
Date: Tue Oct 2 15:07:01 2007
New Revision: 581409
URL: http://svn.apache.org/viewvc?rev=581409&view=rev
Log:
improve state-detection attribute handling
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/StateDetection.java
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java?rev=581409&r1=581408&r2=581409&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
Tue Oct 2 15:07:01 2007
@@ -2053,7 +2053,14 @@
*/
public StateDetection getStateDetection()
{
- return stateDetection;
+ if(!stateDetection.isInherit())
+ {
+ return stateDetection;
+ }
+ else
+ {
+ return getRepository().getStateDetection();
+ }
}
/**
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java?rev=581409&r1=581408&r2=581409&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
Tue Oct 2 15:07:01 2007
@@ -639,7 +639,14 @@
*/
public StateDetection getStateDetection()
{
- return stateDetection;
+ if(!stateDetection.isInherit())
+ {
+ return stateDetection;
+ }
+ else
+ {
+ return getClassDescriptor().getStateDetection();
+ }
}
/**
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/StateDetection.java
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/StateDetection.java?rev=581409&r1=581408&r2=581409&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/StateDetection.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/metadata/StateDetection.java
Tue Oct 2 15:07:01 2007
@@ -57,7 +57,8 @@
*/
public boolean isOn()
{
- return this.equals(ON);
+ // for best performance do simple comparison first
+ return this == ON || !(this == OFF || this == INHERIT) &&
this.equals(ON);
}
/**
@@ -66,7 +67,8 @@
*/
public boolean isOff()
{
- return this.equals(OFF);
+ // for best performance do simple comparison first
+ return this == OFF || !(this == ON || this == INHERIT) &&
this.equals(OFF);
}
/**
@@ -75,7 +77,8 @@
*/
public boolean isInherit()
{
- return this.equals(INHERIT);
+ // for best performance do simple comparison first
+ return this == INHERIT || !(this == OFF || this == ON) &&
this.equals(INHERIT);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
