lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r895342 - in /lucene/java/trunk: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/ contrib/anal...
Date Sun, 03 Jan 2010 10:32:04 GMT
Author: rmuir
Date: Sun Jan  3 10:31:42 2010
New Revision: 895342

URL: http://svn.apache.org/viewvc?rev=895342&view=rev
Log:
LUCENE-2185: add @Deprecated annotations

Modified:
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
    lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
    lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
    lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java
    lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
    lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
    lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
    lucene/java/trunk/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/DistanceApproximation.java
    lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.java
    lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.jj
    lucene/java/trunk/src/java/org/apache/lucene/analysis/Analyzer.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseFilter.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
    lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
    lucene/java/trunk/src/java/org/apache/lucene/document/DateField.java
    lucene/java/trunk/src/java/org/apache/lucene/document/NumberTools.java
    lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java
    lucene/java/trunk/src/java/org/apache/lucene/index/FieldsWriter.java
    lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java
    lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java
    lucene/java/trunk/src/java/org/apache/lucene/store/IndexOutput.java
    lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java
    lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java
    lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleLRUCache.java
    lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleMapCache.java
    lucene/java/trunk/src/test/org/apache/lucene/analysis/TestAnalyzers.java
    lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
    lucene/java/trunk/src/test/org/apache/lucene/search/CheckHits.java
    lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.java
    lucene/java/trunk/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -65,6 +65,7 @@
    * @deprecated use {@link WordlistLoader#getWordSet(File, String)} directly  
    */
   // TODO make this private 
+  @Deprecated
   public static final String STOPWORDS_COMMENT = "#";
   
   /**
@@ -116,6 +117,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #ArabicAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public ArabicAnalyzer( Version matchVersion, String... stopwords ) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords ));
   }
@@ -124,6 +126,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #ArabicAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public ArabicAnalyzer( Version matchVersion, Hashtable<?,?> stopwords ) {
     this(matchVersion, stopwords.keySet());
   }
@@ -132,6 +135,7 @@
    * Builds an analyzer with the given stop words.  Lines can be commented out using {@link #STOPWORDS_COMMENT}
    * @deprecated use {@link #ArabicAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public ArabicAnalyzer( Version matchVersion, File stopwords ) throws IOException {
     this(matchVersion, WordlistLoader.getWordSet( stopwords, STOPWORDS_COMMENT));
   }

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -59,6 +59,7 @@
    * @deprecated use {@link WordlistLoader#getWordSet(File, String)} directly
    */
   //TODO make this private
+  @Deprecated
   public static final String STOPWORDS_COMMENT = "#";
   
   /**

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -58,6 +58,7 @@
 	 * @deprecated use {@link #getDefaultStopSet()} instead
 	 */
   // TODO make this private in 3.1
+	@Deprecated
 	public final static String[] BRAZILIAN_STOP_WORDS = {
       "a","ainda","alem","ambas","ambos","antes",
       "ao","aonde","aos","apos","aquele","aqueles",
@@ -138,6 +139,7 @@
 	 * Builds an analyzer with the given stop words.
 	 * @deprecated use {@link #BrazilianAnalyzer(Version, Set)} instead
 	 */
+  @Deprecated
   public BrazilianAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
   }
@@ -146,6 +148,7 @@
    * Builds an analyzer with the given stop words. 
    * @deprecated use {@link #BrazilianAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public BrazilianAnalyzer(Version matchVersion, Map<?,?> stopwords) {
     this(matchVersion, stopwords.keySet());
   }
@@ -154,6 +157,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #BrazilianAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public BrazilianAnalyzer(Version matchVersion, File stopwords)
       throws IOException {
     this(matchVersion, WordlistLoader.getWordSet(stopwords));
@@ -163,6 +167,7 @@
 	 * Builds an exclusionlist from an array of Strings.
 	 * @deprecated use {@link #BrazilianAnalyzer(Version, Set, Set)} instead
 	 */
+	@Deprecated
 	public void setStemExclusionTable( String... exclusionlist ) {
 		excltable = StopFilter.makeStopSet( matchVersion, exclusionlist );
 		setPreviousTokenStream(null); // force a new stemmer to be created
@@ -171,6 +176,7 @@
 	 * Builds an exclusionlist from a {@link Map}.
 	 * @deprecated use {@link #BrazilianAnalyzer(Version, Set, Set)} instead
 	 */
+	@Deprecated
 	public void setStemExclusionTable( Map<?,?> exclusionlist ) {
 		excltable = new HashSet<Object>(exclusionlist.keySet());
 		setPreviousTokenStream(null); // force a new stemmer to be created
@@ -179,6 +185,7 @@
 	 * Builds an exclusionlist from the words contained in the given file.
 	 * @deprecated use {@link #BrazilianAnalyzer(Version, Set, Set)} instead
 	 */
+	@Deprecated
 	public void setStemExclusionTable( File exclusionlist ) throws IOException {
 		excltable = WordlistLoader.getWordSet( exclusionlist );
 		setPreviousTokenStream(null); // force a new stemmer to be created

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -45,6 +45,7 @@
    */
   // TODO make this final in 3.1 -
   // this might be revised and merged with StopFilter stop words too
+  @Deprecated
   public final static String[] STOP_WORDS = {
     "a", "and", "are", "as", "at", "be",
     "but", "by", "for", "if", "in",
@@ -99,6 +100,7 @@
    * @param stopWords stop word array
    * @deprecated use {@link #CJKAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public CJKAnalyzer(Version matchVersion, String... stopWords) {
     super(matchVersion, StopFilter.makeStopSet(matchVersion, stopWords));
   }

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java Sun Jan  3 10:31:42 2010
@@ -80,6 +80,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], int, int, int, boolean)} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary, int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),minWordSize,minSubwordSize,maxSubwordSize, onlyLongestMatch);
   }
@@ -87,6 +88,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], boolean)} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, onlyLongestMatch);
   }
@@ -94,6 +96,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set, boolean)} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, dictionary,DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, onlyLongestMatch);
   }
@@ -101,6 +104,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[])} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, false);
   }
@@ -108,6 +112,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary) {
     this(Version.LUCENE_30, input, dictionary,DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, false);
   }
@@ -115,6 +120,7 @@
   /**
    * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set, int, int, int, boolean)} instead
    */
+  @Deprecated
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary, int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
   }

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java Sun Jan  3 10:31:42 2010
@@ -46,6 +46,7 @@
    * @param onlyLongestMatch Add only the longest matching subword to the stream
    * @deprecated use {@link #DictionaryCompoundWordTokenFilter(Version, TokenStream, String[], int, int, int, boolean)} instead
    */
+  @Deprecated
   public DictionaryCompoundWordTokenFilter(TokenStream input, String[] dictionary,
       int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     super(Version.LUCENE_30, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
@@ -58,6 +59,7 @@
    * @param dictionary the word dictionary to match against
    * @deprecated use {@link #DictionaryCompoundWordTokenFilter(Version, TokenStream, String[])} instead 
    */
+  @Deprecated
   public DictionaryCompoundWordTokenFilter(TokenStream input, String[] dictionary) {
     super(Version.LUCENE_30, input, dictionary);
   }
@@ -70,6 +72,7 @@
    *        lower case strings.
    * @deprecated use {@link #DictionaryCompoundWordTokenFilter(Version, TokenStream, Set)} instead 
    */
+  @Deprecated
   public DictionaryCompoundWordTokenFilter(TokenStream input, Set dictionary) {
     super(Version.LUCENE_30, input, dictionary);
   }
@@ -86,6 +89,7 @@
    * @param onlyLongestMatch Add only the longest matching subword to the stream
    * @deprecated use {@link #DictionaryCompoundWordTokenFilter(Version, TokenStream, Set, int, int, int, boolean)} instead
    */
+  @Deprecated
   public DictionaryCompoundWordTokenFilter(TokenStream input, Set dictionary,
       int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     super(Version.LUCENE_30, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java Sun Jan  3 10:31:42 2010
@@ -167,6 +167,7 @@
    * @param onlyLongestMatch Add only the longest matching subword to the stream
    * @deprecated use {@link #HyphenationCompoundWordTokenFilter(Version, TokenStream, HyphenationTree, String[], int, int, int, boolean)} instead. 
    */
+  @Deprecated
   public HyphenationCompoundWordTokenFilter(TokenStream input,
       HyphenationTree hyphenator, String[] dictionary, int minWordSize,
       int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
@@ -182,6 +183,7 @@
    * @param dictionary the word dictionary to match against
    * @deprecated use {@link #HyphenationCompoundWordTokenFilter(Version, TokenStream, HyphenationTree, String[])} instead.
    */
+  @Deprecated
   public HyphenationCompoundWordTokenFilter(TokenStream input,
       HyphenationTree hyphenator, String[] dictionary) {
     this(Version.LUCENE_30, input, hyphenator, makeDictionary(dictionary), DEFAULT_MIN_WORD_SIZE,
@@ -197,6 +199,7 @@
    *        lower case strings. 
    * @deprecated use {@link #HyphenationCompoundWordTokenFilter(Version, TokenStream, HyphenationTree, Set)} instead.        
    */
+  @Deprecated
   public HyphenationCompoundWordTokenFilter(TokenStream input,
       HyphenationTree hyphenator, Set dictionary) {
     this(Version.LUCENE_30, input, hyphenator, dictionary, DEFAULT_MIN_WORD_SIZE,
@@ -218,6 +221,7 @@
    * @param onlyLongestMatch Add only the longest matching subword to the stream
    * @deprecated use {@link #HyphenationCompoundWordTokenFilter(Version, TokenStream, HyphenationTree, Set, int, int, int, boolean)} instead.
    */
+  @Deprecated
   public HyphenationCompoundWordTokenFilter(TokenStream input,
       HyphenationTree hyphenator, Set dictionary, int minWordSize,
       int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -62,6 +62,7 @@
 	 * @deprecated use {@link #getDefaultStopSet()} instead
 	 */
   // TODO make this private in 3.1
+	@Deprecated
 	public final static String[] CZECH_STOP_WORDS = {
         "a","s","k","o","i","u","v","z","dnes","cz","t\u00edmto","bude\u0161","budem",
         "byli","jse\u0161","m\u016fj","sv\u00fdm","ta","tomto","tohle","tuto","tyto",
@@ -136,6 +137,7 @@
    * @param stopwords a stopword set
    * @deprecated use {@link #CzechAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public CzechAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet( matchVersion, stopwords ));
 	}
@@ -148,6 +150,7 @@
    * @param stopwords a stopword set
    * @deprecated use {@link #CzechAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public CzechAnalyzer(Version matchVersion, HashSet<?> stopwords) {
     this(matchVersion, (Set<?>)stopwords);
 	}
@@ -160,6 +163,7 @@
    * @param stopwords a file containing stopwords
    * @deprecated use {@link #CzechAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public CzechAnalyzer(Version matchVersion, File stopwords ) throws IOException {
     this(matchVersion, (Set<?>)WordlistLoader.getWordSet( stopwords ));
 	}
@@ -172,6 +176,7 @@
      *             and {@link #CzechAnalyzer(Version, Set)} instead
      */
     // TODO extend StopwordAnalyzerBase once this method is gone!
+    @Deprecated
     public void loadStopWords( InputStream wordfile, String encoding ) {
         setPreviousTokenStream(null); // force a new stopfilter to be created
         if ( wordfile == null ) {

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -60,6 +60,7 @@
    * @deprecated use {@link #getDefaultStopSet()} instead
    */
   //TODO make this private in 3.1
+  @Deprecated
   public final static String[] GERMAN_STOP_WORDS = {
     "einer", "eine", "eines", "einem", "einen",
     "der", "die", "das", "dass", "daß",
@@ -137,6 +138,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #GermanAnalyzer(Version, Set)}
    */
+  @Deprecated
   public GermanAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
   }
@@ -145,6 +147,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #GermanAnalyzer(Version, Set)}
    */
+  @Deprecated
   public GermanAnalyzer(Version matchVersion, Map<?,?> stopwords) {
     this(matchVersion, stopwords.keySet());
     
@@ -154,6 +157,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #GermanAnalyzer(Version, Set)}
    */
+  @Deprecated
   public GermanAnalyzer(Version matchVersion, File stopwords) throws IOException {
     this(matchVersion, WordlistLoader.getWordSet(stopwords));
   }
@@ -162,6 +166,7 @@
    * Builds an exclusionlist from an array of Strings.
    * @deprecated use {@link #GermanAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(String[] exclusionlist) {
     exclusionSet = StopFilter.makeStopSet(matchVersion, exclusionlist);
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -171,6 +176,7 @@
    * Builds an exclusionlist from a {@link Map}
    * @deprecated use {@link #GermanAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(Map<?,?> exclusionlist) {
     exclusionSet = new HashSet<Object>(exclusionlist.keySet());
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -180,6 +186,7 @@
    * Builds an exclusionlist from the words contained in the given file.
    * @deprecated use {@link #GermanAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(File exclusionlist) throws IOException {
     exclusionSet = WordlistLoader.getWordSet(exclusionlist);
     setPreviousTokenStream(null); // force a new stemmer to be created

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -95,6 +95,7 @@
      * @param stopwords Array of stopwords to use.
      * @deprecated use {@link #GreekAnalyzer(Version, Set)} instead
      */
+    @Deprecated
     public GreekAnalyzer(Version matchVersion, String... stopwords)
     {
       this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
@@ -104,6 +105,7 @@
      * Builds an analyzer with the given stop words.
      * @deprecated use {@link #GreekAnalyzer(Version, Set)} instead
      */
+    @Deprecated
     public GreekAnalyzer(Version matchVersion, Map<?,?> stopwords)
     {
       this(matchVersion, stopwords.keySet());

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -111,6 +111,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #PersianAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public PersianAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
   }
@@ -119,6 +120,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #PersianAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public PersianAnalyzer(Version matchVersion, Hashtable<?, ?> stopwords) {
     this(matchVersion, stopwords.keySet());
   }
@@ -128,6 +130,7 @@
    * using {@link #STOPWORDS_COMMENT}
    * @deprecated use {@link #PersianAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public PersianAnalyzer(Version matchVersion, File stopwords) throws IOException {
     this(matchVersion, WordlistLoader.getWordSet(stopwords, STOPWORDS_COMMENT));
   }

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java Sun Jan  3 10:31:42 2010
@@ -50,6 +50,7 @@
    * @param articles a set of articles
    * @deprecated use {@link #ElisionFilter(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   public void setArticles(Version matchVersion, Set<?> articles) {
     this.articles = CharArraySet.unmodifiableSet(
         CharArraySet.copy(matchVersion, articles));
@@ -60,6 +61,7 @@
    * @param articles a set of articles
    * @deprecated use {@link #setArticles(Version, Set)} instead
    */
+  @Deprecated
   public void setArticles(Set<?> articles) {
     setArticles(Version.LUCENE_CURRENT, articles);
   }
@@ -74,6 +76,7 @@
    * Constructs an elision filter with standard stop words
    * @deprecated use {@link #ElisionFilter(Version, TokenStream)} instead
    */
+  @Deprecated
   protected ElisionFilter(TokenStream input) {
     this(Version.LUCENE_30, input);
   }
@@ -82,6 +85,7 @@
    * Constructs an elision filter with a Set of stop words
    * @deprecated use {@link #ElisionFilter(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   public ElisionFilter(TokenStream input, Set<?> articles) {
     this(Version.LUCENE_30, input, articles);
   }
@@ -103,6 +107,7 @@
    * Constructs an elision filter with an array of stop words
    * @deprecated use {@link #ElisionFilter(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   public ElisionFilter(TokenStream input, String[] articles) {
     this(Version.LUCENE_CURRENT, input,
         new CharArraySet(Version.LUCENE_CURRENT,

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -68,6 +68,7 @@
    * @deprecated use {@link #getDefaultStopSet()} instead
    */
   // TODO make this private in 3.1
+  @Deprecated
   public final static String[] FRENCH_STOP_WORDS = {
     "a", "afin", "ai", "ainsi", "après", "attendu", "au", "aujourd", "auquel", "aussi",
     "autre", "autres", "aux", "auxquelles", "auxquels", "avait", "avant", "avec", "avoir",
@@ -154,6 +155,7 @@
    * Builds an analyzer with the given stop words.
    * @deprecated use {@link #FrenchAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public FrenchAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
   }
@@ -163,6 +165,7 @@
    * @throws IOException
    * @deprecated use {@link #FrenchAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public FrenchAnalyzer(Version matchVersion, File stopwords) throws IOException {
     this(matchVersion, WordlistLoader.getWordSet(stopwords));
   }
@@ -171,6 +174,7 @@
    * Builds an exclusionlist from an array of Strings.
    * @deprecated use {@link #FrenchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(String... exclusionlist) {
     excltable = StopFilter.makeStopSet(matchVersion, exclusionlist);
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -180,6 +184,7 @@
    * Builds an exclusionlist from a Map.
    * @deprecated use {@link #FrenchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(Map<?,?> exclusionlist) {
     excltable = new HashSet<Object>(exclusionlist.keySet());
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -190,6 +195,7 @@
    * @throws IOException
    * @deprecated use {@link #FrenchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(File exclusionlist) throws IOException {
     excltable = new HashSet<Object>(WordlistLoader.getWordSet(exclusionlist));
     setPreviousTokenStream(null); // force a new stemmer to be created

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -57,6 +57,7 @@
    * List of typical Dutch stopwords.
    * @deprecated use {@link #getDefaultStopSet()} instead
    */
+  @Deprecated
   public final static String[] DUTCH_STOP_WORDS =
       {
         "de", "en", "van", "ik", "te", "dat", "die", "in", "een",
@@ -128,6 +129,7 @@
    * @param stopwords
    * @deprecated use {@link #DutchAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public DutchAnalyzer(Version matchVersion, String... stopwords) {
     this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
   }
@@ -138,6 +140,7 @@
    * @param stopwords
    * @deprecated use {@link #DutchAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public DutchAnalyzer(Version matchVersion, HashSet<?> stopwords) {
     this(matchVersion, (Set<?>)stopwords);
   }
@@ -148,6 +151,7 @@
    * @param stopwords
    * @deprecated use {@link #DutchAnalyzer(Version, Set)} instead
    */
+  @Deprecated
   public DutchAnalyzer(Version matchVersion, File stopwords) {
     // this is completely broken!
     try {
@@ -165,6 +169,7 @@
    * @param exclusionlist
    * @deprecated use {@link #DutchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(String... exclusionlist) {
     excltable = StopFilter.makeStopSet(matchVersion, exclusionlist);
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -174,6 +179,7 @@
    * Builds an exclusionlist from a Hashtable.
    * @deprecated use {@link #DutchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(HashSet<?> exclusionlist) {
     excltable = exclusionlist;
     setPreviousTokenStream(null); // force a new stemmer to be created
@@ -183,6 +189,7 @@
    * Builds an exclusionlist from the words contained in the given file.
    * @deprecated use {@link #DutchAnalyzer(Version, Set, Set)} instead
    */
+  @Deprecated
   public void setStemExclusionTable(File exclusionlist) {
     try {
       excltable = org.apache.lucene.analysis.WordlistLoader.getWordSet(exclusionlist);

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java Sun Jan  3 10:31:42 2010
@@ -78,6 +78,7 @@
    * @deprecated use {@link #ReverseStringFilter(Version, TokenStream)} 
    *    instead. This constructor will be removed in Lucene 4.0
    */
+  @Deprecated
   public ReverseStringFilter(TokenStream in) {
     this(in, NOMARKER);
   }
@@ -95,6 +96,7 @@
    * @deprecated use {@link #ReverseStringFilter(Version, TokenStream, char)} 
    *    instead. This constructor will be removed in Lucene 4.0 
    */
+  @Deprecated
   public ReverseStringFilter(TokenStream in, char marker) {
     this(Version.LUCENE_30, in, marker);
   }
@@ -157,6 +159,7 @@
    * @deprecated use {@link #reverse(Version, String)} instead. This method 
    *    will be removed in Lucene 4.0
    */
+  @Deprecated
   public static String reverse( final String input ){
     return reverse(Version.LUCENE_30, input);
   }
@@ -180,6 +183,7 @@
    * @deprecated use {@link #reverse(Version, char[])} instead. This 
    *    method will be removed in Lucene 4.0
    */
+  @Deprecated
   public static void reverse( final char[] buffer ){
     reverse( buffer, 0, buffer.length );
   }
@@ -202,6 +206,7 @@
    * @deprecated use {@link #reverse(Version, char[], int)} instead. This 
    *    method will be removed in Lucene 4.0
    */
+  @Deprecated
   public static void reverse( final char[] buffer, final int len ){
     reverse( buffer, 0, len );
   }
@@ -229,6 +234,7 @@
    * @deprecated use {@link #reverse(Version, char[], int, int)} instead. This 
    *    method will be removed in Lucene 4.0
    */
+  @Deprecated
   public static void reverse(char[] buffer, int start, int len ) {
     reverseUnicode3(buffer, start, len);
   }
@@ -236,6 +242,7 @@
   /**
    * @deprecated Remove this when support for 3.0 indexes is no longer needed.
    */
+  @Deprecated
   private static void reverseUnicode3( char[] buffer, int start, int len ){
     if( len <= 1 ) return;
     int num = len>>1;

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -72,6 +72,7 @@
      * Builds an analyzer with the given stop words.
      * @deprecated use {@link #RussianAnalyzer(Version, Set)} instead
      */
+    @Deprecated
     public RussianAnalyzer(Version matchVersion, String... stopwords) {
       this(matchVersion, StopFilter.makeStopSet(matchVersion, stopwords));
     }
@@ -93,6 +94,7 @@
      * TODO: create a Set version of this ctor
      * @deprecated use {@link #RussianAnalyzer(Version, Set)} instead
      */
+    @Deprecated
     public RussianAnalyzer(Version matchVersion, Map<?,?> stopwords)
     {
       this(matchVersion, stopwords.keySet());

Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java Sun Jan  3 10:31:42 2010
@@ -29,6 +29,7 @@
  * @deprecated Use {@link LowerCaseFilter} instead, which has the same
  *  functionality. This filter will be removed in Lucene 4.0
  */
+@Deprecated
 public final class RussianLowerCaseFilter extends TokenFilter
 {
     private TermAttribute termAtt;

Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -40,6 +40,7 @@
   /**
    * @deprecated Remove this test when support for 3.0 indexes is no longer needed.
    */
+  @Deprecated
   public void testStopWordLegacy() throws Exception {
     assertAnalyzesTo(new CzechAnalyzer(Version.LUCENE_30), "Pokud mluvime o volnem", 
         new String[] { "mluvime", "volnem" });
@@ -53,6 +54,7 @@
   /**
    * @deprecated Remove this test when support for 3.0 indexes is no longer needed.
    */
+  @Deprecated
   public void testReusableTokenStreamLegacy() throws Exception {
     Analyzer analyzer = new CzechAnalyzer(Version.LUCENE_30);
     assertAnalyzesToReuse(analyzer, "Pokud mluvime o volnem", new String[] { "mluvime", "volnem" });
@@ -69,6 +71,7 @@
    * An input stream that always throws IOException for testing.
    * @deprecated Remove this class when the loadStopWords method is removed.
    */
+  @Deprecated
   private class UnreliableInputStream extends InputStream {
     @Override
     public int read() throws IOException {
@@ -82,6 +85,7 @@
    * this would cause a NPE when it is time to create the StopFilter.
    * @deprecated Remove this test when the loadStopWords method is removed.
    */
+  @Deprecated
   public void testInvalidStopWordFile() throws Exception {
     CzechAnalyzer cz = new CzechAnalyzer(Version.LUCENE_30);
     cz.loadStopWords(new UnreliableInputStream(), "UTF-8");
@@ -94,6 +98,7 @@
    * when using reusable token streams.
    * @deprecated Remove this test when the loadStopWords method is removed.
    */
+  @Deprecated
   public void testStopWordFileReuse() throws Exception {
     CzechAnalyzer cz = new CzechAnalyzer(Version.LUCENE_30);
     assertAnalyzesToReuse(cz, "Česká Republika", 

Modified: lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java (original)
+++ lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java Sun Jan  3 10:31:42 2010
@@ -41,6 +41,7 @@
    * @deprecated Use {@link #TextFragment(CharSequence, int, int)} instead.
    * This constructor will be removed in Lucene 4.0
    */
+	@Deprecated
 	public TextFragment(StringBuffer markedUpText,int textStartPos, int fragNum)
 	{
 		this.markedUpText=markedUpText;

Modified: lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java (original)
+++ lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java Sun Jan  3 10:31:42 2010
@@ -156,6 +156,7 @@
      *  switch to a different DocIdSet implementation yourself.
      *  This method will be removed in Lucene 4.0 
      **/
+    @Deprecated
     protected final DocIdSet finalResult(OpenBitSetDISI result, int maxDocs) {
         return result;
     }

Modified: lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java (original)
+++ lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java Sun Jan  3 10:31:42 2010
@@ -117,6 +117,7 @@
    * switch to a different DocIdSet implementation yourself.
    * This method will be removed in Lucene 4.0 
    */
+  @Deprecated
   protected final DocIdSet finalResult(OpenBitSetDISI result, int maxDocs) {
     return result;
   }

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java Sun Jan  3 10:31:42 2010
@@ -36,6 +36,7 @@
  *             used along the transition from the old query parser to the new
  *             one
  */
+@Deprecated
 public class MultiFieldQueryParserWrapper extends QueryParserWrapper {
 
   /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java Sun Jan  3 10:31:42 2010
@@ -64,6 +64,7 @@
  *             used along the transition from the old query parser to the new
  *             one
  */
+@Deprecated
 public class QueryParserWrapper {
 
   /**

Modified: lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java (original)
+++ lucene/java/trunk/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java Sun Jan  3 10:31:42 2010
@@ -55,6 +55,7 @@
    * Builds the named analyzer with the given stop words.
    * @deprecated Use {@link #SnowballAnalyzer(Version, String, Set)} instead.  
    */
+  @Deprecated
   public SnowballAnalyzer(Version matchVersion, String name, String[] stopWords) {
     this(matchVersion, name);
     stopSet = StopFilter.makeStopSet(matchVersion, stopWords);

Modified: lucene/java/trunk/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/DistanceApproximation.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/DistanceApproximation.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/DistanceApproximation.java (original)
+++ lucene/java/trunk/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/DistanceApproximation.java Sun Jan  3 10:31:42 2010
@@ -27,6 +27,7 @@
  * @deprecated This has been replaced with more accurate
  * math in {@link LLRect}. This class will be removed in a future release.
  */
+@Deprecated
 public class DistanceApproximation
 {
   private double m_testLat;

Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.java (original)
+++ lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.java Sun Jan  3 10:31:42 2010
@@ -43,6 +43,7 @@
   /**
    * @deprecated Use HTMLParser(FileInputStream) instead
    */
+  @Deprecated
   public HTMLParser(File file) throws FileNotFoundException {
     this(new FileInputStream(file));
   }

Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.jj
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.jj?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.jj (original)
+++ lucene/java/trunk/src/demo/org/apache/lucene/demo/html/HTMLParser.jj Sun Jan  3 10:31:42 2010
@@ -70,6 +70,7 @@
   /**
    * @deprecated Use HTMLParser(FileInputStream) instead
    */
+  @Deprecated
   public HTMLParser(File file) throws FileNotFoundException {
     this(new FileInputStream(file));
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/Analyzer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/Analyzer.java Sun Jan  3 10:31:42 2010
@@ -85,11 +85,13 @@
   }
 
   /** @deprecated */
+  @Deprecated
   protected boolean overridesTokenStreamMethod = false;
 
   /** @deprecated This is only present to preserve
    *  back-compat of classes that subclass a core analyzer
    *  and override tokenStream but not reusableTokenStream */
+  @Deprecated
   protected void setOverridesTokenStreamMethod(Class<? extends Analyzer> baseClass) {
     try {
       Method m = this.getClass().getMethod("tokenStream", String.class, Reader.class);

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java Sun Jan  3 10:31:42 2010
@@ -117,6 +117,7 @@
    *          otherwise <code>true</code>.
    * @deprecated use {@link #CharArraySet(Version, int, boolean)} instead
    */
+  @Deprecated
   public CharArraySet(int startSize, boolean ignoreCase) {
     this(Version.LUCENE_30, startSize, ignoreCase);
   }
@@ -131,6 +132,7 @@
    *          otherwise <code>true</code>.
    * @deprecated use {@link #CharArraySet(Version, Collection, boolean)} instead         
    */  
+  @Deprecated
   public CharArraySet(Collection<? extends Object> c, boolean ignoreCase) {
     this(Version.LUCENE_30, c.size(), ignoreCase);
     addAll(c);
@@ -381,6 +383,7 @@
    *         preserved.
    * @deprecated use {@link #copy(Version, Set)} instead.
    */
+  @Deprecated
   public static CharArraySet copy(final Set<?> set) {
     if(set == EMPTY_SET)
       return EMPTY_SET;

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java Sun Jan  3 10:31:42 2010
@@ -31,6 +31,7 @@
  * This class is included for use with existing
  * indexes and will be removed in a future release (possibly Lucene 4.0).
  */
+@Deprecated
 public final class ISOLatin1AccentFilter extends TokenFilter {
   public ISOLatin1AccentFilter(TokenStream input) {
     super(input);

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseFilter.java Sun Jan  3 10:31:42 2010
@@ -50,6 +50,7 @@
   /**
    * @deprecated Use {@link #LowerCaseFilter(Version, TokenStream)} instead.
    */
+  @Deprecated
   public LowerCaseFilter(TokenStream in) {
     this(Version.LUCENE_30, in);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java Sun Jan  3 10:31:42 2010
@@ -64,6 +64,7 @@
    * @param ignoreCase if true, all words are lower cased first
    * @deprecated use {@link #StopFilter(Version, TokenStream, Set, boolean)} instead
    */
+  @Deprecated
   public StopFilter(boolean enablePositionIncrements, TokenStream input, Set<?> stopWords, boolean ignoreCase)
   {
     this(Version.LUCENE_30, enablePositionIncrements, input, stopWords, ignoreCase);
@@ -117,6 +118,7 @@
    * @see #makeStopSet(Version, java.lang.String[])
    * @deprecated use {@link #StopFilter(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   public StopFilter(boolean enablePositionIncrements, TokenStream in, Set<?> stopWords) {
     this(Version.LUCENE_CURRENT, enablePositionIncrements, in, stopWords, false);
   }
@@ -148,6 +150,7 @@
    * @see #makeStopSet(Version, java.lang.String[], boolean) passing false to ignoreCase
    * @deprecated use {@link #makeStopSet(Version, String...)} instead
    */
+  @Deprecated
   public static final Set<Object> makeStopSet(String... stopWords) {
     return makeStopSet(Version.LUCENE_30, stopWords, false);
   }
@@ -176,6 +179,7 @@
    * @see #makeStopSet(Version, java.lang.String[], boolean) passing false to ignoreCase
    * @deprecated use {@link #makeStopSet(Version, List)} instead
    */
+  @Deprecated
   public static final Set<Object> makeStopSet(List<?> stopWords) {
     return makeStopSet(Version.LUCENE_30, stopWords, false);
   }
@@ -202,6 +206,7 @@
    * @return a Set containing the words
    * @deprecated use {@link #makeStopSet(Version, String[], boolean)} instead;
    */  
+  @Deprecated
   public static final Set<Object> makeStopSet(String[] stopWords, boolean ignoreCase) {
     return makeStopSet(Version.LUCENE_30, stopWords, ignoreCase);
   }
@@ -226,6 +231,7 @@
    * @return A Set ({@link CharArraySet}) containing the words
    * @deprecated use {@link #makeStopSet(Version, List, boolean)} instead
    */
+  @Deprecated
   public static final Set<Object> makeStopSet(List<?> stopWords, boolean ignoreCase){
     return makeStopSet(Version.LUCENE_30, stopWords, ignoreCase);
   }
@@ -271,6 +277,7 @@
    * or later, it returns true.
    * @deprecated use {@link #StopFilter(Version, TokenStream, Set)} instead
    */
+  @Deprecated
   public static boolean getEnablePositionIncrementsVersionDefault(Version matchVersion) {
     return matchVersion.onOrAfter(Version.LUCENE_29);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java Sun Jan  3 10:31:42 2010
@@ -71,6 +71,7 @@
    * @deprecated this solves a bug where HOSTs that end with '.' are identified
    *             as ACRONYMs.
    */
+  @Deprecated
   public static final int ACRONYM_DEP       = 8;
 
   /** String token types that correspond to token type int constants */
@@ -227,6 +228,7 @@
    *
    * @deprecated Remove in 3.X and make true the only valid value
    */
+  @Deprecated
   public boolean isReplaceInvalidAcronym() {
     return replaceInvalidAcronym;
   }
@@ -238,6 +240,7 @@
    *
    * See https://issues.apache.org/jira/browse/LUCENE-1068
    */
+  @Deprecated
   public void setReplaceInvalidAcronym(boolean replaceInvalidAcronym) {
     this.replaceInvalidAcronym = replaceInvalidAcronym;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java Sun Jan  3 10:31:42 2010
@@ -354,6 +354,7 @@
  * @deprecated this solves a bug where HOSTs that end with '.' are identified
  *             as ACRONYMs.
  */
+@Deprecated
 public static final int ACRONYM_DEP       = StandardTokenizer.ACRONYM_DEP;
 
 public static final String [] TOKEN_TYPES = StandardTokenizer.TOKEN_TYPES;

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex Sun Jan  3 10:31:42 2010
@@ -55,6 +55,7 @@
  * @deprecated this solves a bug where HOSTs that end with '.' are identified
  *             as ACRONYMs.
  */
+@Deprecated
 public static final int ACRONYM_DEP       = StandardTokenizer.ACRONYM_DEP;
 
 public static final String [] TOKEN_TYPES = StandardTokenizer.TOKEN_TYPES;

Modified: lucene/java/trunk/src/java/org/apache/lucene/document/DateField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/document/DateField.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/document/DateField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/document/DateField.java Sun Jan  3 10:31:42 2010
@@ -57,6 +57,7 @@
  * This class is included for use with existing
  * indices and will be removed in a future release (possibly Lucene 4.0).
  */
+@Deprecated
 public class DateField {
   
   private DateField() {}

Modified: lucene/java/trunk/src/java/org/apache/lucene/document/NumberTools.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/document/NumberTools.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/document/NumberTools.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/document/NumberTools.java Sun Jan  3 10:31:42 2010
@@ -44,6 +44,7 @@
  * This class is included for use with existing
  * indices and will be removed in a future release (possibly Lucene 4.0).
  */
+@Deprecated
 public class NumberTools {
 
     private static final int RADIX = 36;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java Sun Jan  3 10:31:42 2010
@@ -412,6 +412,7 @@
     private int toRead;
     private long pointer;
     /** @deprecated Only kept for backward-compatbility with <3.0 indexes. Will be removed in 4.0. */
+    @Deprecated
     private boolean isCompressed;
 
     public LazyField(String name, Field.Store store, int toRead, long pointer, boolean isBinary, boolean isCompressed) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldsWriter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldsWriter.java Sun Jan  3 10:31:42 2010
@@ -32,6 +32,7 @@
   static final byte FIELD_IS_BINARY = 0x2;
   
   /** @deprecated Kept for backwards-compatibility with <3.0 indexes; will be removed in 4.0 */
+  @Deprecated
   static final byte FIELD_IS_COMPRESSED = 0x4;
 
   // Original format

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java Sun Jan  3 10:31:42 2010
@@ -1276,6 +1276,7 @@
    * We do it with R/W access for the tests (BW compatibility)
    * @deprecated Remove this when tests are fixed!
    */
+  @Deprecated
   static SegmentReader getOnlySegmentReader(Directory dir) throws IOException {
     return getOnlySegmentReader(IndexReader.open(dir,false));
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java Sun Jan  3 10:31:42 2010
@@ -373,6 +373,7 @@
   }
 
   /** @deprecated Use {@link #getDirectory} instead. */
+  @Deprecated
   public File getFile() {
     return getDirectory();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java Sun Jan  3 10:31:42 2010
@@ -146,6 +146,7 @@
    *                instead, and construct the string
    *                from those utf8 bytes
    */
+  @Deprecated
   public void readChars(char[] buffer, int start, int length)
        throws IOException {
     final int end = start + length;
@@ -174,6 +175,7 @@
    * @deprecated this method operates on old "modified utf8" encoded
    *             strings
    */
+  @Deprecated
   public void skipChars(int length) throws IOException{
     for (int i = 0; i < length; i++) {
       byte b = readByte();

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/IndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/IndexOutput.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/IndexOutput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/IndexOutput.java Sun Jan  3 10:31:42 2010
@@ -114,6 +114,7 @@
    * @deprecated -- please pre-convert to utf8 bytes
    * instead or use {@link #writeString}
    */
+  @Deprecated
   public void writeChars(String s, int start, int length)
        throws IOException {
     final int end = start + length;
@@ -139,6 +140,7 @@
    * @param length the number of characters in the sequence
    * @deprecated -- please pre-convert to utf8 bytes instead or use {@link #writeString}
    */
+  @Deprecated
   public void writeChars(char[] s, int start, int length)
     throws IOException {
     final int end = start + length;

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java Sun Jan  3 10:31:42 2010
@@ -39,6 +39,7 @@
    * @see #getNoLockFactory()
    */
   // make private in 4.0!
+  @Deprecated
   public NoLockFactory() {}
 
   public static NoLockFactory getNoLockFactory() {

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java Sun Jan  3 10:31:42 2010
@@ -27,6 +27,7 @@
  * A serializable Enum class.
  * @deprecated Use Java 5 enum, will be removed in a later Lucene 3.x release.
  */
+@Deprecated
 @SuppressWarnings("serial")
 public abstract class Parameter implements Serializable
 {

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleLRUCache.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleLRUCache.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleLRUCache.java Sun Jan  3 10:31:42 2010
@@ -28,6 +28,7 @@
  * @deprecated Lucene's internal use of this class has now
  * switched to {@link DoubleBarrelLRUCache}.
  */
+@Deprecated
 public class SimpleLRUCache<K,V> extends SimpleMapCache<K,V> {
   private final static float LOADFACTOR = 0.75f;
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleMapCache.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleMapCache.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleMapCache.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/cache/SimpleMapCache.java Sun Jan  3 10:31:42 2010
@@ -29,6 +29,7 @@
  * @deprecated Lucene's internal use of this class has now
  * switched to {@link DoubleBarrelLRUCache}.
  */
+@Deprecated
 public class SimpleMapCache<K,V> extends Cache<K,V> {
   protected Map<K,V> map;
   

Modified: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestAnalyzers.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestAnalyzers.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/analysis/TestAnalyzers.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/analysis/TestAnalyzers.java Sun Jan  3 10:31:42 2010
@@ -154,6 +154,7 @@
    * @deprecated remove this when lucene 3.0 "broken unicode 4" support
    * is no longer needed.
    */
+  @Deprecated
   private static class LowerCaseWhitespaceAnalyzerBWComp extends Analyzer {
 
     @Override
@@ -215,6 +216,7 @@
    * @deprecated remove this test when lucene 3.0 "broken unicode 4" support
    * is no longer needed.
    */
+  @Deprecated
   public void testLowerCaseFilterBWComp() throws IOException {
     Analyzer a = new LowerCaseWhitespaceAnalyzerBWComp();
     // BMP

Modified: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java Sun Jan  3 10:31:42 2010
@@ -254,6 +254,7 @@
    * @deprecated remove this test when lucene 3.0 "broken unicode 4" support is
    *             no longer needed.
    */
+  @Deprecated
   public void testSupplementaryCharsBWCompat() {
     String missing = "Term %s is missing in the set";
     String falsePos = "Term %s is in the set but shouldn't";
@@ -285,6 +286,7 @@
    * @deprecated remove this test when lucene 3.0 "broken unicode 4" support is
    *             no longer needed.
    */
+  @Deprecated
   public void testSingleHighSurrogateBWComapt() {
     String missing = "Term %s is missing in the set";
     String falsePos = "Term %s is in the set but shouldn't";

Modified: lucene/java/trunk/src/test/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/CheckHits.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/CheckHits.java Sun Jan  3 10:31:42 2010
@@ -456,6 +456,7 @@
      * @deprecated
      * @see CheckHits#EXPLAIN_SCORE_TOLERANCE_DELTA
      */
+    @Deprecated
     public static float SCORE_TOLERANCE_DELTA = 0.00005f;
 
     Query q;

Modified: lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.java Sun Jan  3 10:31:42 2010
@@ -84,6 +84,7 @@
   /** Use only for testing.
    *  @deprecated -- in 3.0 we can use Arrays.toString
    *  instead */
+  @Deprecated
   public static String arrayToString(int[] array) {
     StringBuilder buf = new StringBuilder();
     buf.append("[");
@@ -100,6 +101,7 @@
   /** Use only for testing.
    *  @deprecated -- in 3.0 we can use Arrays.toString
    *  instead */
+  @Deprecated
   public static String arrayToString(Object[] array) {
     StringBuilder buf = new StringBuilder();
     buf.append("[");

Modified: lucene/java/trunk/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java?rev=895342&r1=895341&r2=895342&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java Sun Jan  3 10:31:42 2010
@@ -18,6 +18,7 @@
 */
 
 /** @deprecated */
+@Deprecated
 public class TestSimpleLRUCache extends BaseTestLRU {
   public void testLRUCache() throws Exception {
     final int n = 100;



Mime
View raw message