|
From: <one...@us...> - 2003-01-20 12:56:39
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util
In directory sc8-pr-cvs1:/tmp/cvs-serv2323/sf/hibernate/util
Modified Files:
ArrayHelper.java NamingHelper.java PropertiesHelper.java
StringHelper.java
Log Message:
major refactoring to create SQL Generation layer
more efficient queries against normalized mappings
Index: ArrayHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/ArrayHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArrayHelper.java 5 Jan 2003 02:11:24 -0000 1.3
--- ArrayHelper.java 20 Jan 2003 12:48:17 -0000 1.4
***************
*** 18,21 ****
--- 18,27 ----
}
+ public static String[] fillArray(String str, int length) {
+ String[] result = new String[length];
+ Arrays.fill(result, str);
+ return result;
+ }
+
public static String[] toStringArray(java.util.Collection coll) {
return toStringArray( coll.toArray() );
***************
*** 69,72 ****
--- 75,85 ----
}
return list;
+ }
+
+ public static String[] join(String[] x, String[] y) {
+ String[] result = new String[ x.length + y.length ];
+ for ( int i=0; i<x.length; i++ ) result[i] = x[i];
+ for ( int i=0; i<y.length; i++ ) result[i+x.length] = y[i];
+ return result;
}
}
Index: NamingHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/NamingHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NamingHelper.java 5 Jan 2003 02:11:25 -0000 1.3
--- NamingHelper.java 20 Jan 2003 12:48:17 -0000 1.4
***************
*** 50,54 ****
}
catch (Exception e) {
! Name n = ctx.getNameParser("").parse(name);
while ( n.size() > 1 ) {
String ctxName = n.get(0);
--- 50,54 ----
}
catch (Exception e) {
! Name n = ctx.getNameParser(StringHelper.EMPTY_STRING).parse(name);
while ( n.size() > 1 ) {
String ctxName = n.get(0);
Index: PropertiesHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/PropertiesHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PropertiesHelper.java 9 Jan 2003 12:24:52 -0000 1.4
--- PropertiesHelper.java 20 Jan 2003 12:48:17 -0000 1.5
***************
*** 37,41 ****
map.put(
tokens.nextToken(),
! tokens.hasMoreElements() ? tokens.nextToken() : ""
);
}
--- 37,41 ----
map.put(
tokens.nextToken(),
! tokens.hasMoreElements() ? tokens.nextToken() : StringHelper.EMPTY_STRING
);
}
Index: StringHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/StringHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StringHelper.java 17 Jan 2003 08:51:39 -0000 1.5
--- StringHelper.java 20 Jan 2003 12:48:17 -0000 1.6
***************
*** 8,14 ****
public final class StringHelper {
public static String join(String seperator, String[] strings) {
int length = strings.length;
! if (length==0) return "";
StringBuffer buf = new StringBuffer( length * strings[0].length() )
.append(strings[0]);
--- 8,22 ----
public final class StringHelper {
+ public static final String EMPTY_STRING="";
+ public static final char DOT='.';
+ public static final char UNDERSCORE='_';
+ public static final String COMMA_SPACE=", ";
+ public static final String COMMA = ",";
+ public static final String OPEN_PAREN = "(";
+ public static final String CLOSE_PAREN = ")";
+
public static String join(String seperator, String[] strings) {
int length = strings.length;
! if (length==0) return EMPTY_STRING;
StringBuffer buf = new StringBuffer( length * strings[0].length() )
.append(strings[0]);
***************
*** 79,83 ****
int loc = qualifiedName.lastIndexOf(".");
if ( loc<0 ) {
! return "";
}
else {
--- 87,91 ----
int loc = qualifiedName.lastIndexOf(".");
if ( loc<0 ) {
! return EMPTY_STRING;
}
else {
***************
*** 145,149 ****
StringBuffer buf = new StringBuffer(len * 12);
for ( int i=0; i<len-1; i++ ) {
! buf.append( array[i] ).append(", ");
}
return buf.append( array[len-1] ).toString();
--- 153,157 ----
StringBuffer buf = new StringBuffer(len * 12);
for ( int i=0; i<len-1; i++ ) {
! buf.append( array[i] ).append(StringHelper.COMMA_SPACE);
}
return buf.append( array[len-1] ).toString();
|