| |
@@ -10,7 +10,6 @@ |
| 10 |
10 |
|
import org.litesoft.bo.attributes.*; |
| 11 |
11 |
|
import org.litesoft.codegen.*; |
| 12 |
12 |
|
import org.litesoft.core.typeutils.*; |
| 13 |
|
- |
import org.litesoft.core.util.*; |
| 14 |
13 |
|
import org.litesoft.orsup.lazyeval.*; |
| 15 |
14 |
|
import org.litesoft.util.*; |
| 16 |
15 |
|
|
| |
@@ -98,7 +97,7 @@ |
| 98 |
97 |
|
{ |
| 99 |
98 |
|
if ( A_PairedToOne.TYPE.equals( zAttribute.getAttributeSetType() ) ) |
| 100 |
99 |
|
{ |
| 101 |
|
- |
String zToOne = UtilsCommon.justClassNameIfPackage( zAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| |
100 |
+ |
String zToOne = Objects.justClassNameIfPackage( zAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| 102 |
101 |
|
return zToOne + ".class"; |
| 103 |
102 |
|
} |
| 104 |
103 |
|
} |
| |
@@ -645,8 +644,8 @@ |
| 645 |
644 |
|
mErrorSinc.addError( "CurrentlyUnsupportedAttributeType", pAttribute.toString(), mObjectMetaData.toStringForError() ); |
| 646 |
645 |
|
return; |
| 647 |
646 |
|
} |
| 648 |
|
- |
String zSimpleDataTypeSimpleName = UtilsCommon.justClassName( zSimpleDataTypeClass ); |
| 649 |
|
- |
String zSimpleDataType = UtilsCommon.justClassNameIfPackage( zSimpleDataTypeClass, JAVA_LANG_PACKAGE ); |
| |
647 |
+ |
String zSimpleDataTypeSimpleName = Objects.justClassName( zSimpleDataTypeClass ); |
| |
648 |
+ |
String zSimpleDataType = Objects.justClassNameIfPackage( zSimpleDataTypeClass, JAVA_LANG_PACKAGE ); |
| 650 |
649 |
|
|
| 651 |
650 |
|
String zDBtype = null; |
| 652 |
651 |
|
LiteSoftToJDBCtypeSupport zJDBCtypeSupport = !pAttribute.isVirtual() ? LiteSoftToJDBCtypeSupport.get( zSimpleDataTypeClass ) : null; |
| |
@@ -931,7 +930,7 @@ |
| 931 |
930 |
|
private void addToOneRegular( AttributeProxy pAttribute, boolean pRequired, boolean pCascadeDeleteThem ) |
| 932 |
931 |
|
{ |
| 933 |
932 |
|
String zName = pAttribute.getName(); |
| 934 |
|
- |
String zToOne = UtilsCommon.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| |
933 |
+ |
String zToOne = Objects.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| 935 |
934 |
|
String zGenericType = "<" + mObjectName + "," + zToOne + ">"; |
| 936 |
935 |
|
String zAAtype = "AttributeAccessorSCDtoOneRegular" + zGenericType; |
| 937 |
936 |
|
addLine( "public static final " + zAAtype + " CD_" + zName + " = new AttributeAccessor_" + zName + "();" ); |
| |
@@ -1040,7 +1039,7 @@ |
| 1040 |
1039 |
|
private void addAttributeToOneVirtual( AttributeProxy pAttribute ) |
| 1041 |
1040 |
|
{ |
| 1042 |
1041 |
|
String zName = pAttribute.getName(); |
| 1043 |
|
- |
String zToOne = UtilsCommon.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| |
1042 |
+ |
String zToOne = Objects.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| 1044 |
1043 |
|
String zGenericType = "<" + mObjectName + "," + zToOne + ">"; |
| 1045 |
1044 |
|
String zAAtype = "AttributeAccessorSCDtoOneVirtual" + zGenericType; |
| 1046 |
1045 |
|
addLine( "public static final " + zAAtype + " CD_" + zName + " = new AttributeAccessor_" + zName + "();" ); |
| |
@@ -1162,7 +1161,7 @@ |
| 1162 |
1161 |
|
{ |
| 1163 |
1162 |
|
// A_PairedToOne.TYPE, pPersisted - Not Really Persisted - MetaData Driven for Object Reference; |
| 1164 |
1163 |
|
String zName = pAttribute.getName(); |
| 1165 |
|
- |
String zToOne = UtilsCommon.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| |
1164 |
+ |
String zToOne = Objects.justClassNameIfPackage( pAttribute.getToOneFullyQualifiedName(), mPackage + "." ); |
| 1166 |
1165 |
|
String zGenericType = "<" + mObjectName + "," + zToOne + ">"; |
| 1167 |
1166 |
|
String zAAtype = "AttributeAccessorSCDtoOnePaired" + zGenericType; |
| 1168 |
1167 |
|
addLine( "public static final " + zAAtype + " CD_" + zName + " = new AttributeAccessor_" + zName + "();" ); |
| |
@@ -1254,7 +1253,7 @@ |
| 1254 |
1253 |
|
private void addToMany( String pForm, AttributeProxy pAttribute, boolean pCascadeDeleteThem ) |
| 1255 |
1254 |
|
{ |
| 1256 |
1255 |
|
String zName = pAttribute.getName(); |
| 1257 |
|
- |
String zToMany = UtilsCommon.justClassNameIfPackage( pAttribute.getToManyFullyQualifiedName(), mPackage + "." ); |
| |
1256 |
+ |
String zToMany = Objects.justClassNameIfPackage( pAttribute.getToManyFullyQualifiedName(), mPackage + "." ); |
| 1258 |
1257 |
|
String zGenericType = "<" + mObjectName + "," + zToMany + ">"; |
| 1259 |
1258 |
|
String zAAtype = "AttributeAccessorSCDtoMany" + pForm + zGenericType; |
| 1260 |
1259 |
|
addLine( "public static final " + zAAtype + " CD_" + zName + " = new AttributeAccessor_" + zName + "();" ); |
| |
@@ -1376,7 +1375,7 @@ |
| 1376 |
1375 |
|
private void addAttributeToManyVirtual( AttributeProxy pAttribute ) |
| 1377 |
1376 |
|
{ |
| 1378 |
1377 |
|
String zName = pAttribute.getName(); |
| 1379 |
|
- |
String zToMany = UtilsCommon.justClassNameIfPackage( pAttribute.getToManyFullyQualifiedName(), mPackage + "." ); |
| |
1378 |
+ |
String zToMany = Objects.justClassNameIfPackage( pAttribute.getToManyFullyQualifiedName(), mPackage + "." ); |
| 1380 |
1379 |
|
String zGenericType = "<" + mObjectName + "," + zToMany + ">"; |
| 1381 |
1380 |
|
String zAAtype = "AttributeAccessorSCDtoManyVirtual" + zGenericType; |
| 1382 |
1381 |
|
addLine( "public static final " + zAAtype + " CD_" + zName + " = new AttributeAccessor_" + zName + "();" ); |
View this file contents
View the full history
Commits for