From 83b728a384e823ecce0095b1c61fce1f2ebf7872 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Tue, 5 Apr 2011 01:32:36 +0300
Subject: [PATCH] rename some histogram collectors

---
 .../search/facet/histogram/HistogramFacetProcessor.java       | 4 ++--
 ...mFacetCollector.java => ValueHistogramFacetCollector.java} | 4 ++--
 ...Collector.java => ValueScriptHistogramFacetCollector.java} | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/{KeyValueHistogramFacetCollector.java => ValueHistogramFacetCollector.java} (96%)
 rename modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/{KeyValueScriptHistogramFacetCollector.java => ValueScriptHistogramFacetCollector.java} (94%)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java
index 7dfe298d663..5e47a23d4e3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java
@@ -102,14 +102,14 @@ public class HistogramFacetProcessor extends AbstractComponent implements FacetP
         }
 
         if (valueScript != null) {
-            return new KeyValueScriptHistogramFacetCollector(facetName, keyField, scriptLang, valueScript, params, interval, comparatorType, context);
+            return new ValueScriptHistogramFacetCollector(facetName, keyField, scriptLang, valueScript, params, interval, comparatorType, context);
         } else if (valueField == null) {
             return new CountHistogramFacetCollector(facetName, keyField, interval, comparatorType, context);
         } else if (keyField.equals(valueField)) {
             return new FullHistogramFacetCollector(facetName, keyField, interval, comparatorType, context);
         } else {
             // we have a value field, and its different than the key
-            return new KeyValueHistogramFacetCollector(facetName, keyField, valueField, interval, comparatorType, context);
+            return new ValueHistogramFacetCollector(facetName, keyField, valueField, interval, comparatorType, context);
         }
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueHistogramFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueHistogramFacetCollector.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueHistogramFacetCollector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueHistogramFacetCollector.java
index 8cee41ff399..ff14c8fb123 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueHistogramFacetCollector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueHistogramFacetCollector.java
@@ -39,7 +39,7 @@ import java.io.IOException;
  *
  * @author kimchy (shay.banon)
  */
-public class KeyValueHistogramFacetCollector extends AbstractFacetCollector {
+public class ValueHistogramFacetCollector extends AbstractFacetCollector {
 
     private final String keyIndexFieldName;
 
@@ -58,7 +58,7 @@ public class KeyValueHistogramFacetCollector extends AbstractFacetCollector {
 
     private final HistogramProc histoProc;
 
-    public KeyValueHistogramFacetCollector(String facetName, String keyFieldName, String valueFieldName, long interval, HistogramFacet.ComparatorType comparatorType, SearchContext context) {
+    public ValueHistogramFacetCollector(String facetName, String keyFieldName, String valueFieldName, long interval, HistogramFacet.ComparatorType comparatorType, SearchContext context) {
         super(facetName);
         this.interval = interval;
         this.comparatorType = comparatorType;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueScriptHistogramFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueScriptHistogramFacetCollector.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueScriptHistogramFacetCollector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueScriptHistogramFacetCollector.java
index fe5847723fe..1e472e3c9de 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueScriptHistogramFacetCollector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ValueScriptHistogramFacetCollector.java
@@ -43,7 +43,7 @@ import java.util.Map;
  *
  * @author kimchy (shay.banon)
  */
-public class KeyValueScriptHistogramFacetCollector extends AbstractFacetCollector {
+public class ValueScriptHistogramFacetCollector extends AbstractFacetCollector {
 
     private final String indexFieldName;
 
@@ -59,7 +59,7 @@ public class KeyValueScriptHistogramFacetCollector extends AbstractFacetCollecto
 
     private final HistogramProc histoProc;
 
-    public KeyValueScriptHistogramFacetCollector(String facetName, String fieldName, String scriptLang, String valueScript, Map<String, Object> params, long interval, HistogramFacet.ComparatorType comparatorType, SearchContext context) {
+    public ValueScriptHistogramFacetCollector(String facetName, String fieldName, String scriptLang, String valueScript, Map<String, Object> params, long interval, HistogramFacet.ComparatorType comparatorType, SearchContext context) {
         super(facetName);
         this.comparatorType = comparatorType;
         this.fieldDataCache = context.fieldDataCache();