From 613cd64f31dc4fbb9e6a64cdb97b7935aa9848d8 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 28 Jan 2012 16:13:24 +0000
Subject: [PATCH] deprecated hook for separate norms should not be abstract:
 4.x codecs use a clean api

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1237083 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/lucene/codecs/NormsFormat.java    | 11 +++++++++--
 .../lucene/codecs/lucene40/Lucene40NormsFormat.java   |  7 -------
 .../codecs/simpletext/SimpleTextNormsFormat.java      |  9 +--------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java b/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
index d7745bab90b..94e70e76c40 100644
--- a/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
+++ b/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
@@ -30,8 +30,6 @@ import org.apache.lucene.store.Directory;
  */
 public abstract class NormsFormat {
   public abstract PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException;
-  @Deprecated
-  public abstract PerDocProducer docsProducer(SegmentReadState state, Directory separateNormsDir) throws IOException;
   public abstract PerDocProducer docsProducer(SegmentReadState state) throws IOException;
   public abstract void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException;
   
@@ -41,4 +39,13 @@ public abstract class NormsFormat {
    */
   @Deprecated
   public void separateFiles(Directory dir, SegmentInfo info, Set<String> files) throws IOException {};
+  
+  /**
+   * Note: this should not be overridden!
+   * @deprecated
+   */
+  @Deprecated
+  public PerDocProducer docsProducer(SegmentReadState state, Directory separateNormsDir) throws IOException {
+    return docsProducer(state);
+  }
 }
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java b/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
index 288aee47ad8..a4b0c5aacf4 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
@@ -55,13 +55,6 @@ public class Lucene40NormsFormat extends NormsFormat {
     Lucene40NormsDocValuesConsumer.files(dir, info, files);
 
   }
-
-  @Override
-  public PerDocProducer docsProducer(SegmentReadState state,
-      Directory separateNormsDir) throws IOException {
-    return docsProducer(state);
-  }
-  
  
   public static class Lucene40NormsDocValuesProducer extends Lucene40DocValuesProducer {
 
diff --git a/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java b/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
index 7ddacf98bd1..7c3052d3c94 100644
--- a/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
+++ b/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
@@ -51,12 +51,5 @@ public class SimpleTextNormsFormat extends NormsFormat {
       throws IOException {
     SimpleTextNormsConsumer.files(dir, info, files);
 
-  }
-
-  @Override
-  public PerDocProducer docsProducer(SegmentReadState state,
-      Directory separateNormsDir) throws IOException {
-    return docsProducer(state);
-  }
-   
+  }   
 }