/**
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.solr.analysis;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.util.Version;

import java.io.Reader;
import java.io.IOException;

/**
 * @version $Id$
 * @deprecated Use {@link HTMLStripCharFilterFactory} and {@link StandardTokenizerFactory}
 */
@Deprecated
public class HTMLStripStandardTokenizerFactory extends BaseTokenizerFactory {
  public Tokenizer create(Reader input) {
    return new StandardTokenizer(Version.LUCENE_24, new HTMLStripReader(input));
  }
}

@@ -843,48 +843,25 @@
 ort 
-org.apache.lucene.analysis.TokenStream
+java.io.Reader
 ;%0A
+%0A
 impo
@@ -1007,60 +1007,8 @@
 n;%0A%0A
-import java.io.Reader;%0Aimport java.io.IOException;%0A%0A
 /**%0A
@@ -1251,16 +1251,16 @@
 nput) %7B%0A
-
     retu
@@ -1332,14 +1332,241 @@
 nput));%0A
+    // nocommit: what to do about this?%0A//    new HTMLStripReader(input)) %7B%0A//      @Override%0A//      public void reset(Reader reader) throws IOException %7B%0A//        super.reset(new HTMLStripReader(reader));%0A//      %7D%0A//    %7D;%0A
   %7D%0A%7D%0A

add nocommit