[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java BasicRenderer.java,1.6,1.7

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java
In directory sc8-pr-cvs1:/tmp/cvs-serv3780

Modified Files:
	BasicRenderer.java 
Log Message:
applied Max Andersen's patch for private get/set pair problem

Index: BasicRenderer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/BasicRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BasicRenderer.java	24 Jan 2003 13:30:19 -0000	1.6
--- BasicRenderer.java	1 Feb 2003 13:25:08 -0000	1.7
***************
*** 122,126 ****
              Field field = (Field) fields.next();
              
!             String fieldScope = getFieldScope(field, "scope-field");
              writer.println( 
              	"    /** " + 
--- 122,126 ----
              Field field = (Field) fields.next();
              
!             String fieldScope = getFieldScope(field, "scope-field", "private");
              writer.println( 
              	"    /** " + 
***************
*** 278,282 ****
          
              // getter
!             String getAccessScope = getFieldScope(field, "scope-get");
              String getterType = ( field.getType().toLowerCase().equals("boolean") ) ? " is" : " get";
          
--- 278,282 ----
          
              // getter
!             String getAccessScope = getFieldScope(field, "scope-get", "public");
              String getterType = ( field.getType().toLowerCase().equals("boolean") ) ? " is" : " get";
          
***************
*** 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() + ";");
--- 290,294 ----
          
              // setter
!             String setAccessScope = getFieldScope(field, "scope-set", "public");
              writer.println("    " + setAccessScope + " void set" + field.getAsSuffix() + StringHelper.OPEN_PAREN + getTrueTypeName(field, class2classmap) + " " + field.getName() + ") {");
              writer.println("        this." + field.getName() + " = " + field.getName() + ";");
***************
*** 349,354 ****
      }
      
!     public String getFieldScope(Field field, String localScopeName) {
!         return ( field.getMeta(localScopeName)==null )? "private" : field.getMetaAsString(localScopeName);
      }
          
--- 349,355 ----
      }
      
!     public String getFieldScope(Field field, String localScopeName, String defaultScope) {
!         if (defaultScope==null) defaultScope = "private";
!         return ( field.getMeta(localScopeName)==null )? defaultScope : field.getMetaAsString(localScopeName);
      }