Author: sannegrinovero Date: 2009-11-26 02:48:17 -0500 (Thu, 26 Nov 2009) New Revision: 18070 Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java Log: cosmetic changes in Calendar and Date Bridges, and SearchException vs HibernateException. Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java 2009-11-25 16:44:58 UTC (rev 18069) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java 2009-11-26 07:48:17 UTC (rev 18070) @@ -1,11 +1,34 @@ +/* $Id$ + * + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program 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 distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.search.bridge.builtin; +import org.hibernate.search.SearchException; import org.hibernate.search.annotations.Resolution; import org.hibernate.search.bridge.ParameterizedBridge; import org.hibernate.search.bridge.TwoWayStringBridge; import org.hibernate.util.StringHelper; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; import org.apache.lucene.document.DateTools; import java.util.Date; @@ -14,7 +37,6 @@ import java.util.Map; import java.text.ParseException; - public class CalendarBridge implements TwoWayStringBridge, ParameterizedBridge { private DateTools.Resolution resolution; @@ -26,7 +48,6 @@ public static final TwoWayStringBridge CALENDAR_SECOND = new CalendarBridge( Resolution.SECOND ); public static final TwoWayStringBridge CALENDAR_MILLISECOND = new CalendarBridge( Resolution.MILLISECOND ); - public CalendarBridge() { } @@ -46,19 +67,17 @@ resolution = DateResolutionUtil.getLuceneResolution( hibResolution ); } - - public Object stringToObject(String stringValue) { - if ( StringHelper.isEmpty( stringValue )) { + if ( StringHelper.isEmpty( stringValue ) ) { return null; } try { - Date date = DateTools.stringToDate(stringValue); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); + Date date = DateTools.stringToDate( stringValue ); + Calendar calendar = Calendar.getInstance(); + calendar.setTime( date ); return calendar; } catch (ParseException e) { - throw new HibernateException( "Unable to parse into calendar: " + stringValue, e ); + throw new SearchException( "Unable to parse into calendar: " + stringValue, e ); } } Property changes on: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java 2009-11-25 16:44:58 UTC (rev 18069) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java 2009-11-26 07:48:17 UTC (rev 18070) @@ -30,8 +30,7 @@ import java.util.Map; import org.apache.lucene.document.DateTools; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; +import org.hibernate.search.SearchException; import org.hibernate.search.bridge.ParameterizedBridge; import org.hibernate.search.annotations.Resolution; import org.hibernate.search.bridge.TwoWayStringBridge; @@ -78,7 +77,7 @@ return DateTools.stringToDate( stringValue ); } catch (ParseException e) { - throw new HibernateException( "Unable to parse into date: " + stringValue, e ); + throw new SearchException( "Unable to parse into date: " + stringValue, e ); } } @@ -97,8 +96,7 @@ else { hibResolution = (Resolution) resolution; } - this.resolution = DateResolutionUtil.getLuceneResolution(hibResolution ); + this.resolution = DateResolutionUtil.getLuceneResolution( hibResolution ); } - }