Author: fdesbois Date: 2010-05-26 13:49:20 +0200 (Wed, 26 May 2010) New Revision: 1978 Url: http://nuiton.org/repositories/revision/topia/1978 Log: change constant name for from separator Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 11:39:47 UTC (rev 1977) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 11:49:20 UTC (rev 1978) @@ -234,8 +234,10 @@ private static final Log log = LogFactory.getLog(TopiaQuery.class); - public static final String DEFAULT_FROM_SEPARATOR = ", "; + public static final String FROM_SEPARATOR_DEFAULT = ", "; + public static final String FROM_SEPARATOR_JOIN = " JOIN "; + /** Params for HQL query * */ protected List<Object> params; @@ -420,13 +422,13 @@ * * @param str the element to add * @param separator The separator to use before adding the element (if null - * the {@link #DEFAULT_FROM_SEPARATOR} will be used). + * the {@link #FROM_SEPARATOR_DEFAULT} will be used). * @return the TopiaQuery * @since 2.4 */ public TopiaQuery addFrom(String str, String separator) { if (separator == null) { - separator = DEFAULT_FROM_SEPARATOR; + separator = FROM_SEPARATOR_DEFAULT; } from.append(separator).append(str); return this;