[Druid-cvs] druid/build/src/mod/datagen/code/java Java.java, 1.25, 1.26

[Mark <mh...@us...>]

Update of /cvsroot/druid/druid/build/src/mod/datagen/code/java
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv8737

Modified Files:
	Java.java 
Log Message:
Change name of method and move to the utility methods section

Index: Java.java
===================================================================
RCS file: /cvsroot/druid/druid/build/src/mod/datagen/code/java/Java.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Java.java	28 Nov 2007 19:56:30 -0000	1.25
--- Java.java	28 Nov 2007 20:00:59 -0000	1.26
***************
*** 479,483 ****
  		w += "package " + sett.getPackage() + ";" + LF;
  		w += LF;
! 		w += getDateAndUtilImport(node);
  
  
--- 479,483 ----
  		w += "package " + sett.getPackage() + ";" + LF;
  		w += LF;
! 		w += getExtraImports(node);
  
  
***************
*** 506,544 ****
  	}
  
- 	private String getDateAndUtilImport(TableNode node)
- 	{
- 		StringBuffer w = new StringBuffer();
- 
- 		for (int i = 0; i < node.getChildCount(); i++)
- 		{
- 			FieldNode field = (FieldNode) node.getChild(i);
- 			TypeInfo ti = DataTypeLib.getTypeInfo(field);
- 			String className = ti.ddEquiv;
- 
- 			Class clazz = null;
- 			try {
- 				clazz = Class.forName("java.util." + className);
- 			} catch (ClassNotFoundException e) {
- 				try {
- 					clazz = Class.forName("java.math." + className);
- 				} catch (ClassNotFoundException ex)  {}
- 			}
- 			if (clazz != null) {
- 				w.append("import ");
- 				w.append(clazz.getName());
- 				w.append(";");
- 				w.append(LF);
- 			}
- 		}
- 		if (!DataLib.getReferences(node, false).isEmpty()) {
- 			w.append("import java.util.Collection;");
- 			w.append(LF);
- 			w.append("import java.util.ArrayList;");
- 			w.append(LF);
- 		}
- 		return w.toString();
- 	}
- 
- 
  	//---------------------------------------------------------------------------
  
--- 506,509 ----
***************
*** 604,607 ****
--- 569,606 ----
  	}
  
+ 	private String getExtraImports(TableNode node)
+ 	{
+ 		StringBuffer w = new StringBuffer();
+ 
+ 		for (int i = 0; i < node.getChildCount(); i++)
+ 		{
+ 			FieldNode field = (FieldNode) node.getChild(i);
+ 			TypeInfo ti = DataTypeLib.getTypeInfo(field);
+ 			String className = ti.ddEquiv;
+ 
+ 			Class clazz = null;
+ 			try {
+ 				clazz = Class.forName("java.util." + className);
+ 			} catch (ClassNotFoundException e) {
+ 				try {
+ 					clazz = Class.forName("java.math." + className);
+ 				} catch (ClassNotFoundException ex)  {}
+ 			}
+ 			if (clazz != null) {
+ 				w.append("import ");
+ 				w.append(clazz.getName());
+ 				w.append(";");
+ 				w.append(LF);
+ 			}
+ 		}
+ 		if (!DataLib.getReferences(node, false).isEmpty()) {
+ 			w.append("import java.util.Collection;");
+ 			w.append(LF);
+ 			w.append("import java.util.ArrayList;");
+ 			w.append(LF);
+ 		}
+ 		return w.toString();
+ 	}
+ 
  	//---------------------------------------------------------------------------