Fix duplicate code and one version of getWeightedSpanTerms - should accept a TokenStream now rather than a CachingTokenStream. Also fixes getWeightedSpanTermsWithScores to intern the fieldname.
lucene/java/trunk/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java