From: <gca...@us...> - 2010-06-07 08:33:04
|
Revision: 2624 http://openutils.svn.sourceforge.net/openutils/?rev=2624&view=rev Author: gcatania Date: 2010-06-07 08:32:57 +0000 (Mon, 07 Jun 2010) Log Message: ----------- compile fixes, adding license BSHD-5 Modified Paths: -------------- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2010-06-07 07:11:35 UTC (rev 2623) +++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2010-06-07 08:32:57 UTC (rev 2624) @@ -36,7 +36,6 @@ import java.util.Map; import org.aopalliance.aop.AspectException; -import org.apache.commons.collections.CollectionUtils; import org.hibernate.Criteria; import org.hibernate.Hibernate; import org.hibernate.HibernateException; @@ -53,6 +52,7 @@ import org.springframework.aop.framework.AopContext; import org.springframework.orm.hibernate3.HibernateCallback; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.util.CollectionUtils; /** @@ -732,14 +732,14 @@ } } // EnhancedExample.create(crit, filter, metadata); - if (CollectionUtils.isNotEmpty(additionalCriteria)) + if (!CollectionUtils.isEmpty(additionalCriteria)) { for (Criterion criterion : additionalCriteria) { crit.add(criterion); } } - if (CollectionUtils.isNotEmpty(properties)) + if (!CollectionUtils.isEmpty(properties)) { ProjectionList projectionList = Projections.projectionList(); Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2010-06-07 07:11:35 UTC (rev 2623) +++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2010-06-07 08:32:57 UTC (rev 2624) @@ -1,3 +1,28 @@ +/** + * + * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + package it.openutils.hibernate.example; import org.hibernate.Criteria; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |