Menu
▾
▴
[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java BasicRenderer.java,1.5,1.6 ClassMapping.java,1.7,1.8
|
From: <one...@us...> - 2003-01-24 13:30:23
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java
In directory sc8-pr-cvs1:/tmp/cvs-serv25732
Modified Files:
BasicRenderer.java ClassMapping.java
Log Message:
applied Max Andersen's patch, fixing field scope meta stuff
Index: BasicRenderer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/BasicRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BasicRenderer.java 20 Jan 2003 12:48:16 -0000 1.5
--- BasicRenderer.java 24 Jan 2003 13:30:19 -0000 1.6
***************
*** 122,126 ****
Field field = (Field) fields.next();
! String fieldScope = getFieldScope(field, "property-scope", "scope-field");
writer.println(
" /** " +
--- 122,126 ----
Field field = (Field) fields.next();
! String fieldScope = getFieldScope(field, "scope-field");
writer.println(
" /** " +
***************
*** 278,282 ****
// getter
! String getAccessScope = getFieldScope(field, "scope", "scope-get");
String getterType = ( field.getType().toLowerCase().equals("boolean") ) ? " is" : " get";
--- 278,282 ----
// getter
! String getAccessScope = getFieldScope(field, "scope-get");
String getterType = ( field.getType().toLowerCase().equals("boolean") ) ? " is" : " get";
***************
*** 290,294 ****
// setter
! String setAccessScope = getFieldScope(field, "scope", "scope-set");
writer.println(" " + setAccessScope + " void set" + field.getAsSuffix() + StringHelper.OPEN_PAREN + getTrueTypeName(field, class2classmap) + " " + field.getName() + ") {");
writer.println(" this." + field.getName() + " = " + field.getName() + ";");
--- 290,294 ----
// setter
! String setAccessScope = getFieldScope(field, "scope-set");
writer.println(" " + setAccessScope + " void set" + field.getAsSuffix() + StringHelper.OPEN_PAREN + getTrueTypeName(field, class2classmap) + " " + field.getName() + ") {");
writer.println(" this." + field.getName() + " = " + field.getName() + ";");
***************
*** 349,359 ****
}
! public String getFieldScope(Field field, String defaultScopeName, String localScopeName) {
! String defaultScope = ( field.getMeta(defaultScopeName)==null )? "public" : field.getMetaAsString(defaultScopeName);
! String fieldScope = defaultScope;
! if (field.getMeta(localScopeName) != null) {
! fieldScope = field.getMetaAsString(localScopeName);
! }
! return fieldScope;
}
--- 349,354 ----
}
! public String getFieldScope(Field field, String localScopeName) {
! return ( field.getMeta(localScopeName)==null )? "private" : field.getMetaAsString(localScopeName);
}
Index: ClassMapping.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/ClassMapping.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ClassMapping.java 20 Jan 2003 12:48:16 -0000 1.7
--- ClassMapping.java 24 Jan 2003 13:30:19 -0000 1.8
***************
*** 138,143 ****
else {
//Composite id class
! ClassMapping mapping = new ClassMapping(cmpid, true, inheritedMeta);
! MultiMap metaForCompositeid = MetaAttributeHelper.loadAndMergeMetaMap(cmpid, inheritedMeta);
mapping.implementEquals();
ClassName classType = new ClassName();
--- 138,143 ----
else {
//Composite id class
! ClassMapping mapping = new ClassMapping(cmpid, true, metaattribs);
! MultiMap metaForCompositeid = MetaAttributeHelper.loadAndMergeMetaMap(cmpid, metaattribs);
mapping.implementEquals();
ClassName classType = new ClassName();
***************
*** 155,159 ****
Element property = (Element) properties.next();
! MultiMap metaForProperty = MetaAttributeHelper.loadAndMergeMetaMap(property, inheritedMeta);
String name = property.getAttributeValue("name");
if ( name == null || name.trim().equals(StringHelper.EMPTY_STRING) ) {
--- 155,159 ----
Element property = (Element) properties.next();
! MultiMap metaForProperty = MetaAttributeHelper.loadAndMergeMetaMap(property, metaattribs);
String name = property.getAttributeValue("name");
if ( name == null || name.trim().equals(StringHelper.EMPTY_STRING) ) {
***************
*** 210,214 ****
Element onetoone = (Element) onetoones.next();
! MultiMap metaForOneToOne = MetaAttributeHelper.loadAndMergeMetaMap(onetoone,inheritedMeta);
String name = onetoone.getAttributeValue("name");
--- 210,214 ----
Element onetoone = (Element) onetoones.next();
! MultiMap metaForOneToOne = MetaAttributeHelper.loadAndMergeMetaMap(onetoone,metaattribs);
String name = onetoone.getAttributeValue("name");
***************
*** 228,232 ****
Element manyToOne = (Element) manytoOnes.next();
! MultiMap metaForManyToOne = MetaAttributeHelper.loadAndMergeMetaMap(manyToOne,inheritedMeta);
String name = manyToOne.getAttributeValue("name");
--- 228,232 ----
Element manyToOne = (Element) manytoOnes.next();
! MultiMap metaForManyToOne = MetaAttributeHelper.loadAndMergeMetaMap(manyToOne,metaattribs);
String name = manyToOne.getAttributeValue("name");
***************
*** 252,261 ****
// collections
! doCollections(classElement, "list", "java.util.List", "java.util.ArrayList", inheritedMeta);
! doCollections(classElement, "map", "java.util.Map", "java.util.HashMap", inheritedMeta);
! doCollections(classElement, "set", "java.util.Set", "java.util.HashSet", inheritedMeta);
! doCollections(classElement, "bag", "java.util.Collection", "java.util.ArrayList", inheritedMeta);
! doArrays(classElement, "array", inheritedMeta);
! doArrays(classElement, "primitive-array", inheritedMeta);
--- 252,261 ----
// collections
! doCollections(classElement, "list", "java.util.List", "java.util.ArrayList", metaattribs);
! doCollections(classElement, "map", "java.util.Map", "java.util.HashMap", metaattribs);
! doCollections(classElement, "set", "java.util.Set", "java.util.HashSet", metaattribs);
! doCollections(classElement, "bag", "java.util.Collection", "java.util.ArrayList", metaattribs);
! doArrays(classElement, "array", metaattribs);
! doArrays(classElement, "primitive-array", metaattribs);
***************
*** 266,270 ****
for ( Iterator iter = classElement.getChildren("component").iterator(); iter.hasNext(); ) {
Element cmpe = (Element) iter.next();
! MultiMap metaForComponent = MetaAttributeHelper.loadAndMergeMetaMap(cmpe, inheritedMeta);
String cmpname = cmpe.getAttributeValue("name");
String cmpclass = cmpe.getAttributeValue("class");
--- 266,270 ----
for ( Iterator iter = classElement.getChildren("component").iterator(); iter.hasNext(); ) {
Element cmpe = (Element) iter.next();
! MultiMap metaForComponent = MetaAttributeHelper.loadAndMergeMetaMap(cmpe, metaattribs);
String cmpname = cmpe.getAttributeValue("name");
String cmpclass = cmpe.getAttributeValue("class");
***************
*** 273,277 ****
continue;
}
! ClassMapping mapping = new ClassMapping(cmpe, true, inheritedMeta);
ClassName classType = new ClassName();
--- 273,277 ----
continue;
}
! ClassMapping mapping = new ClassMapping(cmpe, true, metaattribs);
ClassName classType = new ClassName();
***************
*** 289,293 ****
for ( Iterator iter = classElement.getChildren("subclass").iterator(); iter.hasNext(); ) {
Element subclass = (Element) iter.next();
! ClassMapping subclassMapping = new ClassMapping(name, this,subclass, inheritedMeta);
subclasses.add(subclassMapping);
}
--- 289,293 ----
for ( Iterator iter = classElement.getChildren("subclass").iterator(); iter.hasNext(); ) {
Element subclass = (Element) iter.next();
! ClassMapping subclassMapping = new ClassMapping(name, this,subclass, metaattribs);
subclasses.add(subclassMapping);
}
***************
*** 295,299 ****
for ( Iterator iter = classElement.getChildren("joined-subclass").iterator(); iter.hasNext(); ) {
Element subclass = (Element) iter.next();
! ClassMapping subclassMapping = new ClassMapping(name, this, subclass, inheritedMeta);
subclasses.add(subclassMapping);
}
--- 295,299 ----
for ( Iterator iter = classElement.getChildren("joined-subclass").iterator(); iter.hasNext(); ) {
Element subclass = (Element) iter.next();
! ClassMapping subclassMapping = new ClassMapping(name, this, subclass, metaattribs);
subclasses.add(subclassMapping);
}
***************
*** 518,522 ****
try {
! ClassMapping mapping = new ClassMapping(compositeElement, true, inheritedMeta);
ClassName classType = new ClassName();
classType.setFullyQualifiedName(compClass);
--- 518,522 ----
try {
! ClassMapping mapping = new ClassMapping(compositeElement, true, metaattribs);
ClassName classType = new ClassName();
classType.setFullyQualifiedName(compClass);
***************
*** 651,654 ****
--- 651,661 ----
}
+
+ /**
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ return "ClassMapping: " + name.getFullyQualifiedName();
+ }
|
