[hibernate-commits] Hibernate SVN: r14692 - in search/trunk/src: java/org/hibernate/search/engine and 3 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue May 27 13:43:30 EDT 2008
Author: sannegrinovero
Date: 2008-05-27 13:43:29 -0400 (Tue, 27 May 2008)
New Revision: 14692
Modified:
search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
Log:
typo in SearchFactoryImplementor interface; some trivial code cleanups.
Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -115,7 +115,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void load(InputStream inStream) throws IOException {
+ public void load(InputStream inStream) throws IOException {
throw new UnsupportedOperationException();
}
@@ -123,7 +123,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void loadFromXML(InputStream in) throws IOException,
+ public void loadFromXML(InputStream in) throws IOException,
InvalidPropertiesFormatException {
throw new UnsupportedOperationException();
}
@@ -140,7 +140,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void save(OutputStream out, String comments) {
+ public void save(OutputStream out, String comments) {
throw new UnsupportedOperationException();
}
@@ -148,7 +148,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object setProperty(String key, String value) {
+ public Object setProperty(String key, String value) {
throw new UnsupportedOperationException();
}
@@ -156,7 +156,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void store(OutputStream out, String comments)
+ public void store(OutputStream out, String comments)
throws IOException {
throw new UnsupportedOperationException();
}
@@ -165,7 +165,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void storeToXML(OutputStream os, String comment,
+ public void storeToXML(OutputStream os, String comment,
String encoding) throws IOException {
throw new UnsupportedOperationException();
}
@@ -174,7 +174,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void storeToXML(OutputStream os, String comment)
+ public void storeToXML(OutputStream os, String comment)
throws IOException {
throw new UnsupportedOperationException();
}
@@ -183,7 +183,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void clear() {
+ public void clear() {
throw new UnsupportedOperationException();
}
@@ -191,7 +191,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object clone() {
+ public Object clone() {
throw new UnsupportedOperationException();
}
@@ -199,7 +199,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized boolean contains(Object value) {
+ public boolean contains(Object value) {
throw new UnsupportedOperationException();
}
@@ -215,7 +215,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Enumeration<Object> elements() {
+ public Enumeration<Object> elements() {
throw new UnsupportedOperationException();
}
@@ -231,12 +231,12 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object get(Object key) {
+ public Object get(Object key) {
throw new UnsupportedOperationException();
}
@Override
- public synchronized boolean isEmpty() {
+ public boolean isEmpty() {
if ( fallBack==null ) {
return masked.isEmpty();
}
@@ -249,7 +249,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Enumeration<Object> keys() {
+ public Enumeration<Object> keys() {
throw new UnsupportedOperationException();
}
@@ -265,7 +265,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object put(Object key, Object value) {
+ public Object put(Object key, Object value) {
throw new UnsupportedOperationException();
}
@@ -273,7 +273,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void putAll(Map<? extends Object, ? extends Object> t) {
+ public void putAll(Map<? extends Object, ? extends Object> t) {
throw new UnsupportedOperationException();
}
@@ -289,7 +289,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object remove(Object key) {
+ public Object remove(Object key) {
throw new UnsupportedOperationException();
}
@@ -297,12 +297,12 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized int size() {
+ public int size() {
throw new UnsupportedOperationException();
}
@Override
- public synchronized String toString() {
+ public String toString() {
return masked.toString();
}
@@ -327,6 +327,8 @@
public boolean equals(Object obj) {
if ( this == obj )
return true;
+ if ( obj == null )
+ return false;
if ( getClass() != obj.getClass() )
return false;
final MaskedProperty other = (MaskedProperty) obj;
Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -39,8 +39,7 @@
public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?> provider);
- //FIXME spelling error in method name:
- void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams);
+ void addIndexingParameters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams);
public String getIndexingStrategy();
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -230,7 +230,7 @@
dirProviderOptimizerStrategies.put( provider, optimizerStrategy );
}
- public void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams) {
+ public void addIndexingParameters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams) {
dirProviderIndexingParams.put( provider, indexingParams );
}
Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -181,7 +181,7 @@
private void configureIndexingParameters(SearchFactoryImplementor searchFactoryImplementor,
Properties directoryProperties, DirectoryProvider<?> provider) {
LuceneIndexingParameters indexingParams = new LuceneIndexingParameters( directoryProperties );
- searchFactoryImplementor.addIndexingParmeters( provider, indexingParams );
+ searchFactoryImplementor.addIndexingParameters( provider, indexingParams );
}
/**
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -1,15 +1,10 @@
//$Id$
package org.hibernate.search.test.bridge;
-import java.util.Arrays;
import java.util.Map;
-import java.util.HashMap;
-import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.ParameterizedBridge;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.annotations.Parameter;
/**
* Padding Integer bridge.
@@ -19,7 +14,7 @@
*/
public class PaddedIntegerBridge implements TwoWayStringBridge, ParameterizedBridge {
- public static String PADDING_PROPERTY = "padding";
+ public static final String PADDING_PROPERTY = "padding";
private int padding = 5; //default
More information about the hibernate-commits
mailing list