[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/util NOTools.java,1.14,1.15 T
Status: Alpha
Brought to you by:
eflorent
|
From: <efl...@us...> - 2003-07-05 13:58:00
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util
In directory sc8-pr-cvs1:/tmp/cvs-serv11638/src/org/devaki/nextobjects/util
Modified Files:
NOTools.java TorqueWrapper.java
Log Message:
Fixed default '' bug
Index: NOTools.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/NOTools.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NOTools.java 5 Jul 2003 12:26:10 -0000 1.14
--- NOTools.java 5 Jul 2003 13:57:57 -0000 1.15
***************
*** 61,65 ****
public static boolean useLnf = true;
// Torque Version
! public static final String TORQUE_VERSION = "3.0";
// Directory of nextObjects
// Please refactory APP_HOME
--- 61,65 ----
public static boolean useLnf = true;
// Torque Version
! public static final String TORQUE_VERSION = "3.1-alpha1";
// Directory of nextObjects
// Please refactory APP_HOME
***************
*** 76,80 ****
public static final String TORQUE_HOME = new StringBuffer().append(USER_HOME)
.append(File.separator)
! .append("torque-")
.append(TORQUE_VERSION)
.toString();
--- 76,80 ----
public static final String TORQUE_HOME = new StringBuffer().append(USER_HOME)
.append(File.separator)
! .append("torque-gen-")
.append(TORQUE_VERSION)
.toString();
Index: TorqueWrapper.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/TorqueWrapper.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TorqueWrapper.java 8 Jun 2003 09:28:26 -0000 1.18
--- TorqueWrapper.java 5 Jul 2003 13:57:57 -0000 1.19
***************
*** 543,547 ****
public static void writeIdTableSchema() {
String xml="<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"no\" ?>";
! xml+="<!DOCTYPE database SYSTEM \"http://jakarta.apache.org/turbine/dtd/database.dtd\">";
xml+="<database name=\"" + database.getCode() + "\">";
xml+="<table name=\"ID_TABLE\" idMethod=\"idbroker\">";
--- 543,547 ----
public static void writeIdTableSchema() {
String xml="<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"no\" ?>";
! xml+="<!DOCTYPE database SYSTEM \"http://jakarta.apache.org/turbine/dtd/database_3_1.dtd\">";
xml+="<database name=\"" + database.getCode() + "\">";
xml+="<table name=\"ID_TABLE\" idMethod=\"idbroker\">";
***************
*** 733,737 ****
Document doc = new Document(new Element("database"));
doc.setDocType(new DocType("database",
! "http://jakarta.apache.org/turbine/dtd/database.dtd"));
Element root=doc.getRootElement();
databaseToXML(root,pDatabase);
--- 733,737 ----
Document doc = new Document(new Element("database"));
doc.setDocType(new DocType("database",
! "http://jakarta.apache.org/turbine/dtd/database_3_1.dtd"));
Element root=doc.getRootElement();
databaseToXML(root,pDatabase);
***************
*** 784,788 ****
// Object Model
if (!pCDM.getDefaultIdMethod().equals("none")
! && pCDM.getDefaultIdMethod()!=null)
{
//root.setAttribute("defaultIdMethod",pCDM.getDefaultIdMethod());
--- 784,789 ----
// Object Model
if (!pCDM.getDefaultIdMethod().equals("none")
! && pCDM.getDefaultIdMethod()!=null
! && !pCDM.getDefaultIdMethod().equals(""))
{
//root.setAttribute("defaultIdMethod",pCDM.getDefaultIdMethod());
***************
*** 928,932 ****
Element tmpElementColumn=new Element("column");
tmpElementColumn.setAttribute("name",pColumn.getCode());
! if (pColumn.getJavaName()!="") {
tmpElementColumn.setAttribute("javaName",pColumn.getCode());
}
--- 929,933 ----
Element tmpElementColumn=new Element("column");
tmpElementColumn.setAttribute("name",pColumn.getCode());
! if (!pColumn.getJavaName().equals("")) {
tmpElementColumn.setAttribute("javaName",pColumn.getCode());
}
***************
*** 947,956 ****
tmpElementColumn.setAttribute("javaType",pColumn.getJavaType());
}
! if (pColumn.getSize()!="")
{
tmpElementColumn.setAttribute("size",pColumn.getSize());
}
! if (pColumn.getDefaultValue()!="") {
tmpElementColumn.setAttribute("default",pColumn.getDefaultValue());
}
tmpElementColumn.setAttribute("autoIncrement",
--- 948,958 ----
tmpElementColumn.setAttribute("javaType",pColumn.getJavaType());
}
! if (!pColumn.getSize().equals(""))
{
tmpElementColumn.setAttribute("size",pColumn.getSize());
}
! if (!pColumn.getDefaultValue().equals("")) {
tmpElementColumn.setAttribute("default",pColumn.getDefaultValue());
+ System.out.println("-"+ pColumn.getDefaultValue() + "-" + pColumn.getDefaultValue().length());
}
tmpElementColumn.setAttribute("autoIncrement",
***************
*** 960,968 ****
tmpElementColumn.setAttribute("inputValidator",
pColumn.getInputValidator()); //ni
! if (pColumn.getJavaNamingMethod()=="null")
{
pColumn.setJavaNamingMethod("nochange");
}
! if (pColumn.getJavaNamingMethod().equals("")) {
tmpElementColumn.setAttribute("javaNamingMethod",
pColumn.getJavaNamingMethod());
--- 962,971 ----
tmpElementColumn.setAttribute("inputValidator",
pColumn.getInputValidator()); //ni
! if (pColumn.getJavaNamingMethod()=="null"
! && !pColumn.getJavaNamingMethod().equals(""))
{
pColumn.setJavaNamingMethod("nochange");
}
! if (!pColumn.getJavaNamingMethod().equals("")) {
tmpElementColumn.setAttribute("javaNamingMethod",
pColumn.getJavaNamingMethod());
|