arminw 2005/12/03 18:22:43
Modified: src/java/org/apache/ojb/broker/metadata Tag: OJB_1_0_RELEASE
ObjectReferenceDescriptor.java
src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
ObjectEnvelopeOrdering.java
Log:
rename method which signals OJB a FK constraint
Revision Changes Path
No revision
No revision
1.37.2.6 +12 -3
db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java
Index: ObjectReferenceDescriptor.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -u -r1.37.2.5 -r1.37.2.6
--- ObjectReferenceDescriptor.java 16 Nov 2005 01:23:49 -0000 1.37.2.5
+++ ObjectReferenceDescriptor.java 4 Dec 2005 02:22:42 -0000 1.37.2.6
@@ -518,20 +518,29 @@
}
/**
- * Returns <em>true</em> if a foreign key to the referenced object is
+ * Returns <em>true</em> if a foreign key constraint to the referenced
object is
* declared, else <em>false</em> is returned.
*/
- public boolean hasForeignKey()
+ public boolean hasConstraint()
{
/*
arminw: Currently we don't have a ForeignKey descriptor object and
a official xml-element to support FK settings. As a workaround I
introduce
a custom-attribute to handle FK settings in
collection-/reference-decriptor
*/
- String result = getAttribute("fk");
+ String result = getAttribute("constraint");
return result != null && result.equalsIgnoreCase("true");
}
+ /**
+ * Set a foreign key constraint flag for this reference - see [EMAIL
PROTECTED] #hasConstraint()}
+ * @param constraint If set <em>true</em>, signals a foreign key
constraint in database.
+ */
+ public void setConstraint(boolean constraint)
+ {
+ addAttribute("constraint", constraint ? "true" : "false");
+ }
+
public String toString()
{
return new ToStringBuilder(this)
No revision
No revision
1.1.2.8 +3 -3
db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeOrdering.java
Index: ObjectEnvelopeOrdering.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeOrdering.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ObjectEnvelopeOrdering.java 27 Oct 2005 18:21:18 -0000 1.1.2.7
+++ ObjectEnvelopeOrdering.java 4 Dec 2005 02:22:43 -0000 1.1.2.8
@@ -293,11 +293,11 @@
ObjectEnvelope refEnvelope = refVertex.getEnvelope();
if (refObject == refEnvelope.getRealObject())
{
- edge = buildConcrete11Edge(vertex, refVertex,
rds.hasForeignKey());
+ edge = buildConcrete11Edge(vertex, refVertex,
rds.hasConstraint());
}
else if
(refClass.isInstance(refVertex.getEnvelope().getRealObject()))
{
- edge = buildPotential11Edge(vertex, refVertex,
rds.hasForeignKey());
+ edge = buildPotential11Edge(vertex, refVertex,
rds.hasConstraint());
}
if (edge != null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
