[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/ddl2hbm Gui.java,1.3,1.4 MapGenerator.java,1.4,1.5

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

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

Modified Files:
	Gui.java MapGenerator.java 
Log Message:
major refactoring to create SQL Generation layer
more efficient queries against normalized mappings

Index: Gui.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/Gui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Gui.java	5 Jan 2003 02:11:23 -0000	1.3
--- Gui.java	20 Jan 2003 12:48:15 -0000	1.4
***************
*** 9,12 ****
--- 9,15 ----
  import java.io.*;
  import javax.swing.*;
+ 
+ import net.sf.hibernate.util.StringHelper;
+ 
  import java.util.*;
  
***************
*** 582,586 ****
  				schemaName.setModel(dcbm);
  				if (prevItem == null) schemaName.setSelectedItem(dbUser.getText());
! 				JOptionPane.showMessageDialog(this, databasePanel, "Select Table Criteria", JOptionPane.QUESTION_MESSAGE);
  				List tables = JDBCUtil.getTables(
  					c,
--- 585,589 ----
  				schemaName.setModel(dcbm);
  				if (prevItem == null) schemaName.setSelectedItem(dbUser.getText());
! 				JOptionPane.showMessageDialog(this, databasePanel, "SimpleSelect Table Criteria", JOptionPane.QUESTION_MESSAGE);
  				List tables = JDBCUtil.getTables(
  					c,
***************
*** 828,836 ****
  		p.put("tableName", tableName.getText());
  		
! 		p.put("singleMapType", "" + optionSingleMap.isSelected());
  		p.put("mapName", mappingFile.getText());
  		p.put("generatorName", generatorName.getSelectedItem());
  		if (this.generationParameters != null) {
! 			String gp="";
  			for (int i=0; i < generationParameters.length; i++) {
  				gp += generationParameters[i] + "\t";
--- 831,839 ----
  		p.put("tableName", tableName.getText());
  		
! 		p.put("singleMapType", StringHelper.EMPTY_STRING + optionSingleMap.isSelected());
  		p.put("mapName", mappingFile.getText());
  		p.put("generatorName", generatorName.getSelectedItem());
  		if (this.generationParameters != null) {
! 			String gp=StringHelper.EMPTY_STRING;
  			for (int i=0; i < generationParameters.length; i++) {
  				gp += generationParameters[i] + "\t";
***************
*** 840,844 ****
  		p.put("keyFieldName", idFieldName.getText());
  		p.put("keyFieldType", keyFieldType.getSelectedItem());
! 		p.put("useHibernateTypes", "" + optionHibernateTypes.isSelected());
  		p.put("packageName", packageName.getText());
  		p.put("baseClass", baseClass.getText());
--- 843,847 ----
  		p.put("keyFieldName", idFieldName.getText());
  		p.put("keyFieldType", keyFieldType.getSelectedItem());
! 		p.put("useHibernateTypes", StringHelper.EMPTY_STRING + optionHibernateTypes.isSelected());
  		p.put("packageName", packageName.getText());
  		p.put("baseClass", baseClass.getText());

Index: MapGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/MapGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MapGenerator.java	16 Jan 2003 20:52:38 -0000	1.4
--- MapGenerator.java	20 Jan 2003 12:48:15 -0000	1.5
***************
*** 12,15 ****
--- 12,17 ----
  import java.io.*;
  import net.sf.hibernate.tool.hbm2java.*;
+ import net.sf.hibernate.util.StringHelper;
+ 
  import javax.xml.transform.*;
  import javax.xml.transform.dom.*;
***************
*** 102,106 ****
  	
  	protected void writeMapping(Document mapping) throws IOException {
! 		java.lang.String pkgName =  packageName.replace('.', java.io.File.separatorChar) + File.separatorChar;
  		File packageDir = new File(outputDirectory, pkgName);
  		if (!packageDir.exists()) packageDir.mkdirs();
--- 104,108 ----
  	
  	protected void writeMapping(Document mapping) throws IOException {
! 		java.lang.String pkgName =  packageName.replace(StringHelper.DOT, java.io.File.separatorChar) + File.separatorChar;
  		File packageDir = new File(outputDirectory, pkgName);
  		if (!packageDir.exists()) packageDir.mkdirs();
***************
*** 246,250 ****
  			identifierElement.setAttribute("type", type);
  			if (pkColumn.sqlColumnLength > 0) {
! 				identifierElement.setAttribute("length", "" + pkColumn.sqlColumnLength);
  			}
  		}
--- 248,252 ----
  			identifierElement.setAttribute("type", type);
  			if (pkColumn.sqlColumnLength > 0) {
! 				identifierElement.setAttribute("length", StringHelper.EMPTY_STRING + pkColumn.sqlColumnLength);
  			}
  		}
***************
*** 277,281 ****
  				property.setAttribute("type", type);
  				if (pkColumn.sqlColumnLength > 0) {
! 					property.setAttribute("length", "" + pkColumn.sqlColumnLength);
  				}
  			}
--- 279,283 ----
  				property.setAttribute("type", type);
  				if (pkColumn.sqlColumnLength > 0) {
! 					property.setAttribute("length", StringHelper.EMPTY_STRING + pkColumn.sqlColumnLength);
  				}
  			}
***************
*** 302,309 ****
  					propertyElement.setAttribute("type", type);
  					if (column.sqlColumnLength > 0) {
! 						propertyElement.setAttribute("length", "" + column.sqlColumnLength);
  					}
  				}
! 				if (column.sqlNotNull) propertyElement.setAttribute("not-null", "" + column.sqlNotNull);
  				logger.debug("column info: " + getXml(propertyElement));
  				classElement.appendChild(propertyElement);
--- 304,311 ----
  					propertyElement.setAttribute("type", type);
  					if (column.sqlColumnLength > 0) {
! 						propertyElement.setAttribute("length", StringHelper.EMPTY_STRING + column.sqlColumnLength);
  					}
  				}
! 				if (column.sqlNotNull) propertyElement.setAttribute("not-null", StringHelper.EMPTY_STRING + column.sqlNotNull);
  				logger.debug("column info: " + getXml(propertyElement));
  				classElement.appendChild(propertyElement);
***************
*** 336,340 ****
  		String memberName = name.toLowerCase();
  		int i;
! 		while ((i = memberName.indexOf('_')) != -1) {
  			java.lang.String tmp1 = memberName.substring(0, i);
  			if (i+1 < memberName.length()) {
--- 338,342 ----
  		String memberName = name.toLowerCase();
  		int i;
! 		while ( (i = memberName.indexOf(StringHelper.UNDERSCORE) ) != -1 ) {
  			java.lang.String tmp1 = memberName.substring(0, i);
  			if (i+1 < memberName.length()) {