Author: fdesbois Date: 2010-02-09 02:02:11 +0100 (Tue, 09 Feb 2010) New Revision: 1795 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: huhu 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-02-09 00:53:35 UTC (rev 1794) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-02-09 01:02:11 UTC (rev 1795) @@ -245,8 +245,6 @@ protected List<String> propertiesToLoad; - protected Class<? extends TopiaEntity> mainEntityClass; - protected String mainAlias; protected TopiaDAO<? extends TopiaEntity> dao; @@ -349,7 +347,6 @@ * @return the TopiaQuery */ public TopiaQuery setFrom(Class<? extends TopiaEntity> mainEntityClass) { - this.mainEntityClass = mainEntityClass; from = new StringBuilder(" FROM ").append(mainEntityClass.getName()); return this; } @@ -377,7 +374,6 @@ * @return the TopiaQuery */ public TopiaQuery addFrom(String str) { -// prepareFrom(); from.append(", ").append(str); return this; } @@ -407,23 +403,6 @@ return addFrom(entityClass.getName() + " " + alias); } -// protected void prepareFrom() throws TopiaException { -// if (from == null) { -// if (mainEntityClass != null) { -// if (mainAlias != null) { -// setFrom(mainEntityClass, mainAlias); -// } else { -// setFrom(mainEntityClass); -// } -// } else { -// throw new TopiaException( -// "The query has no FROM statement set, you have to " + -// "instanciate the query using a DAO or manually set the " + -// "FROM statement using setFrom() method"); -// } -// } -// } - /** * Create a TopiaQuery with entityClass initialization. * @@ -941,8 +920,6 @@ * @see org.nuiton.topia.TopiaContext#find(java.lang.String, java.lang.Object[]) */ public List execute(TopiaContext transaction) throws TopiaException { - // Prepare the From if needed -// prepareFrom(); String query = fullQuery(); if (log.isDebugEnabled()) { log.debug("# QUERY : " + query);