Java Mailing List Archive

http://www.gg3721.com/

Home » Hibernate Commits List »

[hibernate-commits] Hibernate SVN: r14692 - in search/trunk/src:
 java/org/hibernate/search/engine and 3 other directories.

hibernate-commits

2008-05-27


Author Login • Post Reply
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)
@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void load(InputStream inStream) throws IOException {
+  public void load(InputStream inStream) throws IOException {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void loadFromXML(InputStream in) throws IOException,
+  public void loadFromXML(InputStream in) throws IOException,
     InvalidPropertiesFormatException {
   throw new UnsupportedOperationException();
 }
@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void save(OutputStream out, String comments) {
+  public void save(OutputStream out, String comments) {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Object setProperty(String key, String value) {
+  public Object setProperty(String key, String value) {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void store(OutputStream out, String comments)
+  public void store(OutputStream out, String comments)
     throws IOException {
   throw new UnsupportedOperationException();
 }
@@(protected) @@
  * @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();
 }
@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void storeToXML(OutputStream os, String comment)
+  public void storeToXML(OutputStream os, String comment)
     throws IOException {
   throw new UnsupportedOperationException();
 }
@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized void clear() {
+  public void clear() {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Object clone() {
+  public Object clone() {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized boolean contains(Object value) {
+  public boolean contains(Object value) {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Enumeration<Object> elements() {
+  public Enumeration<Object> elements() {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @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();
   }
@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Enumeration<Object> keys() {
+  public Enumeration<Object> keys() {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Object put(Object key, Object value) {
+  public Object put(Object key, Object value) {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @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();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized Object remove(Object key) {
+  public Object remove(Object key) {
   throw new UnsupportedOperationException();
 }

@@(protected) @@
  * @throws UnsupportedOperationException
  */
 @Override
-  public synchronized int size() {
+  public int size() {
   throw new UnsupportedOperationException();
 }

 @Override
-  public synchronized String toString() {
+  public String toString() {
   return masked.toString();
 }

@@(protected) @@
 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)
@@(protected) @@

 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)
@@(protected) @@
   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)
@@(protected) @@
 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)
@@(protected) @@
//$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.
@@(protected) @@
*/
public class PaddedIntegerBridge implements TwoWayStringBridge, ParameterizedBridge {

-  public static String PADDING_PROPERTY = "padding";
+  public static final String PADDING_PROPERTY = "padding";

 private int padding = 5; //default


_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits
©2008 gg3721.com - Jax Systems, LLC, U.S.A.