You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by th...@apache.org on 2003/06/10 22:42:10 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/metadata RepositoryElements.java RepositoryXmlHandler.java ObjectReferenceDescriptor.java
thma 2003/06/10 13:42:10
Modified: src/java/org/apache/ojb/broker/metadata
RepositoryElements.java RepositoryXmlHandler.java
ObjectReferenceDescriptor.java
Log:
clean up anonymous field stuff
Revision Changes Path
1.28 +2 -0 db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java
Index: RepositoryElements.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- RepositoryElements.java 2 May 2003 12:24:31 -0000 1.27
+++ RepositoryElements.java 10 Jun 2003 20:42:09 -0000 1.28
@@ -172,6 +172,8 @@
public static final String TAG_ACCESS_ANONYMOUS = "anonymous";
public static final String TAG_ACCESS_READONLY = "readonly";
public static final String TAG_ACCESS_READWRITE = "readwrite";
+
+ public static final String TAG_SUPER = "super";
}
1.43 +3 -3 db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java
Index: RepositoryXmlHandler.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- RepositoryXmlHandler.java 2 May 2003 18:19:06 -0000 1.42
+++ RepositoryXmlHandler.java 10 Jun 2003 20:42:09 -0000 1.43
@@ -451,12 +451,12 @@
if (isDebug) logger.debug(" " + tags.getTagById(REFERENCED_CLASS) + ": " + classRef);
ObjectReferenceDescriptor ord = null;
- if (name.equals("this"))
+ if (name.equals(TAG_SUPER))
{
checkThis(classRef);
AnonymousObjectReferenceDescriptor aord =
new AnonymousObjectReferenceDescriptor(m_CurrentCLD);
- aord.setPersistentField(null, "this");
+ aord.setPersistentField(null, TAG_SUPER);
ord = aord;
}
else
1.27 +1 -1 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ObjectReferenceDescriptor.java 10 Jun 2003 06:19:24 -0000 1.26
+++ ObjectReferenceDescriptor.java 10 Jun 2003 20:42:09 -0000 1.27
@@ -371,7 +371,7 @@
String name = this.getAttributeName();
if (name == null)
{
- name = "this";
+ name = tags.TAG_SUPER;
}
result += " " + tags.getAttribute(FIELD_NAME, name) + eol;