You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by ma...@apache.org on 2009/11/16 22:24:47 UTC
svn commit: r880963 [4/7] - in /lucene/java/branches/flex_1458: ./ contrib/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/
contrib/analyzers/common/src/java/org/apache/l...
Modified: lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java (original)
+++ lucene/java/branches/flex_1458/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java Mon Nov 16 21:24:41 2009
@@ -82,7 +82,7 @@
* these keeps reference to the decorated table model for data
* only rows that match the search criteria are linked
*/
- private ArrayList rowToModelIndex = new ArrayList();
+ private ArrayList<Integer> rowToModelIndex = new ArrayList<Integer>();
//Lucene stuff.
@@ -285,7 +285,7 @@
}
private int getModelRow(int row){
- return ((Integer) rowToModelIndex.get(row)).intValue();
+ return rowToModelIndex.get(row);
}
/**
@@ -297,7 +297,7 @@
searchString = null;
rowToModelIndex.clear();
for (int t=0; t<tableModel.getRowCount(); t++){
- rowToModelIndex.add(Integer.valueOf(t));
+ rowToModelIndex.add(t);
}
}
@@ -316,7 +316,7 @@
}
@Override
- public Class getColumnClass(int column) {
+ public Class<?> getColumnClass(int column) {
return tableModel.getColumnClass(column);
}
Modified: lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (original)
+++ lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java Mon Nov 16 21:24:41 2009
@@ -115,8 +115,8 @@
private final WikipediaTokenizerImpl scanner;
private int tokenOutput = TOKENS_ONLY;
- private Set untokenizedTypes = Collections.EMPTY_SET;
- private Iterator tokens = null;
+ private Set<String> untokenizedTypes = Collections.emptySet();
+ private Iterator<AttributeSource.State> tokens = null;
private OffsetAttribute offsetAtt;
private TypeAttribute typeAtt;
@@ -131,7 +131,7 @@
* @param input The Input Reader
*/
public WikipediaTokenizer(Reader input) {
- this(input, TOKENS_ONLY, Collections.EMPTY_SET);
+ this(input, TOKENS_ONLY, Collections.<String>emptySet());
}
/**
@@ -142,7 +142,7 @@
* @param tokenOutput One of {@link #TOKENS_ONLY}, {@link #UNTOKENIZED_ONLY}, {@link #BOTH}
* @param untokenizedTypes
*/
- public WikipediaTokenizer(Reader input, int tokenOutput, Set untokenizedTypes) {
+ public WikipediaTokenizer(Reader input, int tokenOutput, Set<String> untokenizedTypes) {
super(input);
this.scanner = new WikipediaTokenizerImpl(input);
init(tokenOutput, untokenizedTypes);
@@ -156,7 +156,7 @@
* @param tokenOutput One of {@link #TOKENS_ONLY}, {@link #UNTOKENIZED_ONLY}, {@link #BOTH}
* @param untokenizedTypes
*/
- public WikipediaTokenizer(AttributeFactory factory, Reader input, int tokenOutput, Set untokenizedTypes) {
+ public WikipediaTokenizer(AttributeFactory factory, Reader input, int tokenOutput, Set<String> untokenizedTypes) {
super(factory, input);
this.scanner = new WikipediaTokenizerImpl(input);
init(tokenOutput, untokenizedTypes);
@@ -170,13 +170,13 @@
* @param tokenOutput One of {@link #TOKENS_ONLY}, {@link #UNTOKENIZED_ONLY}, {@link #BOTH}
* @param untokenizedTypes
*/
- public WikipediaTokenizer(AttributeSource source, Reader input, int tokenOutput, Set untokenizedTypes) {
+ public WikipediaTokenizer(AttributeSource source, Reader input, int tokenOutput, Set<String> untokenizedTypes) {
super(source, input);
this.scanner = new WikipediaTokenizerImpl(input);
init(tokenOutput, untokenizedTypes);
}
- private void init(int tokenOutput, Set untokenizedTypes) {
+ private void init(int tokenOutput, Set<String> untokenizedTypes) {
this.tokenOutput = tokenOutput;
this.untokenizedTypes = untokenizedTypes;
this.offsetAtt = addAttribute(OffsetAttribute.class);
@@ -194,7 +194,7 @@
@Override
public final boolean incrementToken() throws IOException {
if (tokens != null && tokens.hasNext()){
- AttributeSource.State state = (AttributeSource.State) tokens.next();
+ AttributeSource.State state = tokens.next();
restoreState(state);
return true;
}
@@ -230,7 +230,7 @@
int lastPos = theStart + numAdded;
int tmpTokType;
int numSeen = 0;
- List tmp = new ArrayList();
+ List<AttributeSource.State> tmp = new ArrayList<AttributeSource.State>();
setupSavedToken(0, type);
tmp.add(captureState());
//while we can get a token and that token is the same type and we have not transitioned to a new wiki-item of the same type
Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (original)
+++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java Mon Nov 16 21:24:41 2009
@@ -110,8 +110,8 @@
final float boost)
throws IOException
{
- final Set already = new HashSet(); // avoid dups
- List top = new LinkedList(); // needs to be separately listed..
+ final Set<String> already = new HashSet<String>(); // avoid dups
+ List<String> top = new LinkedList<String>(); // needs to be separately listed..
final String field = ( f == null) ? "contents" : f;
if ( a == null) a = new StandardAnalyzer(Version.LUCENE_CURRENT);
@@ -127,7 +127,7 @@
final BooleanQuery tmp = new BooleanQuery();
// [2] form query
- Iterator it = top.iterator();
+ Iterator<String> it = top.iterator();
while ( it.hasNext())
{
// [2a] add to level words in
Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (original)
+++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java Mon Nov 16 21:24:41 2009
@@ -120,8 +120,8 @@
final float boost)
throws IOException
{
- final Set already = new HashSet(); // avoid dups
- List top = new LinkedList(); // needs to be separately listed..
+ final Set<String> already = new HashSet<String>(); // avoid dups
+ List<String> top = new LinkedList<String>(); // needs to be separately listed..
// [1] Parse query into separate words so that when we expand we can avoid dups
TokenStream ts = a.tokenStream( field, new StringReader( query));
@@ -135,11 +135,11 @@
final BooleanQuery tmp = new BooleanQuery();
// [2] form query
- Iterator it = top.iterator();
+ Iterator<String> it = top.iterator();
while ( it.hasNext())
{
// [2a] add to level words in
- String word = (String) it.next();
+ String word = it.next();
TermQuery tq = new TermQuery( new Term( field, word));
tmp.add( tq, BooleanClause.Occur.SHOULD);
Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java (original)
+++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java Mon Nov 16 21:24:41 2009
@@ -106,11 +106,8 @@
* <code>Character.isLetter()</code>.
*/
public String[] getSynonyms(String word) {
- Object syns = table.get(word);
- if (syns == null) return EMPTY;
- if (syns instanceof String) return new String[] {(String) syns};
-
- String[] synonyms = (String[]) syns;
+ String[] synonyms = table.get(word);
+ if (synonyms == null) return EMPTY;
String[] copy = new String[synonyms.length]; // copy for guaranteed immutability
System.arraycopy(synonyms, 0, copy, 0, synonyms.length);
return copy;
@@ -261,7 +258,7 @@
/* Part D: compute index data structure */
- HashMap word2Syns = createIndex(word2Groups, group2Words);
+ HashMap<String,String[]> word2Syns = createIndex(word2Groups, group2Words);
/* Part E: minimize memory consumption by a factor 3 (or so) */
// if (true) return word2Syns;
@@ -308,7 +305,7 @@
return word2Syns;
}
- private HashMap<String,String[]> optimize(HashMap word2Syns, HashMap<String,String> internedWords) {
+ private HashMap<String,String[]> optimize(HashMap<String,String[]> word2Syns, HashMap<String,String> internedWords) {
if (DEBUG) {
System.err.println("before gc");
for (int i=0; i < 10; i++) System.gc();
@@ -347,10 +344,8 @@
for (int k=syns.length; --k >= 0; ) {
syns[k] = internedWords.get(syns[k]);
}
- Object replacement = syns;
- if (syns.length == 1) replacement = syns[0]; // minimize memory consumption some more
word2Syns.remove(words[j]);
- word2Syns.put(internedWords.get(words[j]), replacement);
+ word2Syns.put(internedWords.get(words[j]), syns);
}
if (DEBUG) {
Modified: lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java (original)
+++ lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java Mon Nov 16 21:24:41 2009
@@ -131,9 +131,9 @@
String line;
// maps a word to all the "groups" it's in
- final Map word2Nums = new TreeMap();
+ final Map<String,List<String>> word2Nums = new TreeMap<String,List<String>>();
// maps a group to all the words in it
- final Map num2Words = new TreeMap();
+ final Map<String,List<String>> num2Words = new TreeMap<String,List<String>>();
// number of rejected words
int ndecent = 0;
@@ -177,10 +177,10 @@
// 1/2: word2Nums map
// append to entry or add new one
- List lis =(List) word2Nums.get(word);
+ List<String> lis = word2Nums.get(word);
if (lis == null)
{
- lis = new LinkedList();
+ lis = new LinkedList<String>();
lis.add(num);
word2Nums.put(word, lis);
}
@@ -188,10 +188,10 @@
lis.add(num);
// 2/2: num2Words map
- lis = (List) num2Words.get(num);
+ lis = num2Words.get(num);
if (lis == null)
{
- lis = new LinkedList();
+ lis = new LinkedList<String>();
lis.add(word);
num2Words.put(num, lis);
}
@@ -236,7 +236,7 @@
* @param word2Nums
* @param num2Words
*/
- private static void index(String indexDir, Map word2Nums, Map num2Words)
+ private static void index(String indexDir, Map<String,List<String>> word2Nums, Map<String,List<String>> num2Words)
throws Throwable
{
int row = 0;
@@ -247,10 +247,10 @@
// override the specific index if it already exists
IndexWriter writer = new IndexWriter(dir, ana, true, IndexWriter.MaxFieldLength.LIMITED);
writer.setUseCompoundFile(true); // why?
- Iterator i1 = word2Nums.keySet().iterator();
+ Iterator<String> i1 = word2Nums.keySet().iterator();
while (i1.hasNext()) // for each word
{
- String g = (String) i1.next();
+ String g = i1.next();
Document doc = new Document();
int n = index(word2Nums, num2Words, g, doc);
@@ -276,25 +276,25 @@
/**
* Given the 2 maps fills a document for 1 word.
*/
- private static int index(Map word2Nums, Map num2Words, String g, Document doc)
+ private static int index(Map<String,List<String>> word2Nums, Map<String,List<String>> num2Words, String g, Document doc)
throws Throwable
{
- List keys = (List) word2Nums.get(g); // get list of key#'s
- Iterator i2 = keys.iterator();
+ List<String> keys = word2Nums.get(g); // get list of key#'s
+ Iterator<String> i2 = keys.iterator();
- Set already = new TreeSet(); // keep them sorted
+ Set<String> already = new TreeSet<String>(); // keep them sorted
// pass 1: fill up 'already' with all words
while (i2.hasNext()) // for each key#
{
- already.addAll((List) num2Words.get(i2.next())); // get list of words
+ already.addAll(num2Words.get(i2.next())); // get list of words
}
int num = 0;
already.remove(g); // of course a word is it's own syn
- Iterator it = already.iterator();
+ Iterator<String> it = already.iterator();
while (it.hasNext())
{
- String cur = (String) it.next();
+ String cur = it.next();
// don't store things like 'pit bull' -> 'american pit bull'
if (!isDecent(cur))
{
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java Mon Nov 16 21:24:41 2009
@@ -29,10 +29,10 @@
*/
public class FilterBuilderFactory implements FilterBuilder {
- HashMap builders=new HashMap();
+ HashMap<String,FilterBuilder> builders=new HashMap<String,FilterBuilder>();
public Filter getFilter(Element n) throws ParserException {
- FilterBuilder builder=(FilterBuilder) builders.get(n.getNodeName());
+ FilterBuilder builder= builders.get(n.getNodeName());
if(builder==null)
{
throw new ParserException("No FilterBuilder defined for node "+n.getNodeName());
@@ -45,6 +45,6 @@
}
public FilterBuilder getFilterBuilder(String nodeName)
{
- return (FilterBuilder) builders.get(nodeName);
+ return builders.get(nodeName);
}
}
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java Mon Nov 16 21:24:41 2009
@@ -29,10 +29,10 @@
*/
public class QueryBuilderFactory implements QueryBuilder {
- HashMap builders=new HashMap();
+ HashMap<String,QueryBuilder> builders=new HashMap<String,QueryBuilder>();
public Query getQuery(Element n) throws ParserException {
- QueryBuilder builder=(QueryBuilder) builders.get(n.getNodeName());
+ QueryBuilder builder= builders.get(n.getNodeName());
if(builder==null)
{
throw new ParserException("No QueryObjectBuilder defined for node "+n.getNodeName());
@@ -45,7 +45,7 @@
}
public QueryBuilder getQueryBuilder(String nodeName)
{
- return (QueryBuilder) builders.get(nodeName);
+ return builders.get(nodeName);
}
}
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java Mon Nov 16 21:24:41 2009
@@ -55,7 +55,7 @@
static DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance ();
static TransformerFactory tFactory = TransformerFactory.newInstance();
- HashMap compiledTemplatesCache=new HashMap();
+ HashMap<String,Templates> compiledTemplatesCache=new HashMap<String,Templates>();
Templates defaultCompiledTemplates=null;
@@ -77,13 +77,13 @@
}
public String getQueryAsXmlString(Properties formProperties,String queryTemplateName) throws SAXException, IOException, ParserConfigurationException, TransformerException
{
- Templates ts=(Templates) compiledTemplatesCache.get(queryTemplateName);
+ Templates ts= compiledTemplatesCache.get(queryTemplateName);
return getQueryAsXmlString(formProperties, ts);
}
public Document getQueryAsDOM(Properties formProperties,String queryTemplateName) throws SAXException, IOException, ParserConfigurationException, TransformerException
{
- Templates ts=(Templates) compiledTemplatesCache.get(queryTemplateName);
+ Templates ts= compiledTemplatesCache.get(queryTemplateName);
return getQueryAsDOM(formProperties, ts);
}
public String getQueryAsXmlString(Properties formProperties) throws SAXException, IOException, ParserConfigurationException, TransformerException
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java Mon Nov 16 21:24:41 2009
@@ -53,7 +53,7 @@
private QueryBuilderFactory queryFactory;
private FilterBuilderFactory filterFactory;
- private LRUCache filterCache = null;
+ private LRUCache<Object,Filter> filterCache = null;
private int cacheSize;
@@ -72,7 +72,7 @@
if (filterCache == null)
{
- filterCache = new LRUCache(cacheSize);
+ filterCache = new LRUCache<Object,Filter>(cacheSize);
}
// Test to see if child Element is a query or filter that needs to be
@@ -90,7 +90,7 @@
f = filterFactory.getFilter(childElement);
cacheKey = f;
}
- Filter cachedFilter = (Filter) filterCache.get(cacheKey);
+ Filter cachedFilter = filterCache.get(cacheKey);
if (cachedFilter != null)
{
return cachedFilter; // cache hit
@@ -109,7 +109,7 @@
return cachedFilter;
}
- static class LRUCache extends java.util.LinkedHashMap
+ static class LRUCache<K,V> extends java.util.LinkedHashMap<K,V>
{
public LRUCache(int maxsize)
{
@@ -120,7 +120,7 @@
protected int maxsize;
@Override
- protected boolean removeEldestEntry(Entry eldest)
+ protected boolean removeEldestEntry(Entry<K,V> eldest)
{
return size() > maxsize;
}
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java Mon Nov 16 21:24:41 2009
@@ -70,10 +70,10 @@
//TODO MoreLikeThis needs to ideally have per-field stopWords lists - until then
//I use all analyzers/fields to generate multi-field compatible stop list
String stopWords=e.getAttribute("stopWords");
- Set stopWordsSet=null;
+ Set<String> stopWordsSet=null;
if((stopWords!=null)&&(fields!=null))
{
- stopWordsSet=new HashSet();
+ stopWordsSet=new HashSet<String>();
for (int i = 0; i < fields.length; i++)
{
TokenStream ts = analyzer.tokenStream(fields[i],new StringReader(stopWords));
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java Mon Nov 16 21:24:41 2009
@@ -41,7 +41,7 @@
String slopString=DOMUtils.getAttributeOrFail(e,"slop");
int slop=Integer.parseInt(slopString);
boolean inOrder=DOMUtils.getAttribute(e,"inOrder",false);
- ArrayList spans=new ArrayList();
+ ArrayList<SpanQuery> spans=new ArrayList<SpanQuery>();
for (Node kid = e.getFirstChild(); kid != null; kid = kid.getNextSibling())
{
if (kid.getNodeType() == Node.ELEMENT_NODE)
@@ -49,7 +49,7 @@
spans.add(factory.getSpanQuery((Element) kid));
}
}
- SpanQuery[] spanQueries=(SpanQuery[]) spans.toArray(new SpanQuery[spans.size()]);
+ SpanQuery[] spanQueries= spans.toArray(new SpanQuery[spans.size()]);
SpanNearQuery snq=new SpanNearQuery(spanQueries,slop,inOrder);
return snq;
}
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java Mon Nov 16 21:24:41 2009
@@ -41,7 +41,7 @@
public SpanQuery getSpanQuery(Element e) throws ParserException
{
- ArrayList clausesList=new ArrayList();
+ ArrayList<SpanQuery> clausesList=new ArrayList<SpanQuery>();
for (Node kid = e.getFirstChild(); kid != null; kid = kid.getNextSibling())
{
if (kid.getNodeType() == Node.ELEMENT_NODE)
@@ -50,7 +50,7 @@
clausesList.add(clause);
}
}
- SpanQuery[] clauses=(SpanQuery[]) clausesList.toArray(new SpanQuery[clausesList.size()]);
+ SpanQuery[] clauses= clausesList.toArray(new SpanQuery[clausesList.size()]);
SpanOrQuery soq = new SpanOrQuery(clauses);
soq.setBoost(DOMUtils.getAttribute(e,"boost",1.0f));
return soq;
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java Mon Nov 16 21:24:41 2009
@@ -54,7 +54,7 @@
try
{
- ArrayList clausesList=new ArrayList();
+ ArrayList<SpanQuery> clausesList=new ArrayList<SpanQuery>();
TokenStream ts=analyzer.tokenStream(fieldName,new StringReader(value));
TermAttribute termAtt = ts.addAttribute(TermAttribute.class);
@@ -62,7 +62,7 @@
SpanTermQuery stq=new SpanTermQuery(new Term(fieldName, termAtt.term()));
clausesList.add(stq);
}
- SpanOrQuery soq=new SpanOrQuery((SpanQuery[]) clausesList.toArray(new SpanQuery[clausesList.size()]));
+ SpanOrQuery soq=new SpanOrQuery(clausesList.toArray(new SpanQuery[clausesList.size()]));
soq.setBoost(DOMUtils.getAttribute(e,"boost",1.0f));
return soq;
}
Modified: lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java (original)
+++ lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java Mon Nov 16 21:24:41 2009
@@ -28,7 +28,7 @@
*/
public class SpanQueryBuilderFactory implements SpanQueryBuilder {
- HashMap builders=new HashMap();
+ HashMap<String,SpanQueryBuilder> builders=new HashMap<String,SpanQueryBuilder>();
public Query getQuery(Element e) throws ParserException {
return getSpanQuery(e);
@@ -39,7 +39,7 @@
}
public SpanQuery getSpanQuery(Element e) throws ParserException
{
- SpanQueryBuilder builder=(SpanQueryBuilder) builders.get(e.getNodeName());
+ SpanQueryBuilder builder= builders.get(e.getNodeName());
if(builder==null)
{
throw new ParserException("No SpanQueryObjectBuilder defined for node "+e.getNodeName());
Modified: lucene/java/branches/flex_1458/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/contributions.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/contributions.html (original)
+++ lucene/java/branches/flex_1458/docs/contributions.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -211,6 +211,9 @@
</div>
</div>
</div>
+<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
<div class="menupage">
<div class="menupagetitle">Contributions</div>
</div>
Modified: lucene/java/branches/flex_1458/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/demo.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/demo.html (original)
+++ lucene/java/branches/flex_1458/docs/demo.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
Modified: lucene/java/branches/flex_1458/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/demo2.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/demo2.html (original)
+++ lucene/java/branches/flex_1458/docs/demo2.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
Modified: lucene/java/branches/flex_1458/docs/demo3.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/demo3.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/demo3.html (original)
+++ lucene/java/branches/flex_1458/docs/demo3.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
Modified: lucene/java/branches/flex_1458/docs/demo4.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/demo4.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/demo4.html (original)
+++ lucene/java/branches/flex_1458/docs/demo4.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
Modified: lucene/java/branches/flex_1458/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/fileformats.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/fileformats.html (original)
+++ lucene/java/branches/flex_1458/docs/fileformats.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
@@ -374,7 +377,7 @@
<div class="section">
<p>
This document defines the index file formats used
- in Lucene version 2.9. If you are using a different
+ in Lucene version 3.1. If you are using a different
version of Lucene, please consult the copy of
<span class="codefrag">docs/fileformats.html</span>
that was distributed
@@ -388,7 +391,7 @@
languages</a>. If these versions are to remain compatible with Apache
Lucene, then a language-independent definition of the Lucene index
format is required. This document thus attempts to provide a
- complete and independent definition of the Apache Lucene 2.9 file
+ complete and independent definition of the Apache Lucene 3.1 file
formats.
</p>
<p>
@@ -1850,7 +1853,8 @@
<li>second bit is one for fields containing binary data</li>
<li>third bit is one for fields with compression option enabled
- (if compression is enabled, the algorithm used is ZLIB)</li>
+ (if compression is enabled, the algorithm used is ZLIB),
+ only available for indexes until Lucene version 2.9.x</li>
</ul>
Modified: lucene/java/branches/flex_1458/docs/fileformats.pdf
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/fileformats.pdf?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/fileformats.pdf (original)
+++ lucene/java/branches/flex_1458/docs/fileformats.pdf Mon Nov 16 21:24:41 2009
@@ -397,10 +397,10 @@
>>
endobj
75 0 obj
-<< /Length 2056 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2058 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-GauHM95iiK&AJ$C#^[s4+Aqcse_=ur/9]E.+%CUUHXJ,A(01s$PjHZ0n)unZ;6guiM?&L4Lu^MPb^;4B5O:9mm5D-e6f/)P_q++fNbR'o>pJ!:RQ,!(s8;8Z[L!Aucofp2hi:ojIPb?dZlMk[m:GnTk/2*.o^$@*rPC2D(trC#/&74F[8S(b?MCg4VYtXMlM'#-eLYe9.?F8UEVQ'"*/t;fYu9FoIqu[BXU/UGo#D6%mH@d#lQOsT<i:aYc*UYB'TH\hNo,HA*>:I$(_pJEn[q7cGb!h7]i#m`_M#de$2h;gh`n%bO7:rpo?UFXF#<R6KhMjGJu&^>[<VWI<`J+0$')JfncS_qa!7Ftf]lL-7?k_F(W?.fNZt'HIMa/s;U-Nh&/MgXdW0oNYW0>DKc>84cb[h@2FO-,Ynj$\Wp/qBerOC.%P,d%m_[a2=eRs`;T4G2\@U)$F(%$d&m:+QV(/_`01gFoY]%P;'i4'd1qp)14#HD%/ArK$K*DSO73lHdF*4j<AnQkR"t#<3aT4=n`s4^2MK'>/jH'B$_N6"cJteVg+r+F^7XKmXF[j]9`5)_,$P\&a3!bg],jJ<o+"DHlEZoj=$+UD*R#?q;4C]4&=C`d[-8/I&g@.p@kkKc3WSRD9+JN`*gpY7,L/&_;c'0_-(XoiuNMVK92-EC99jne#EM$Qh^K-3L&Yf5me<\,^o+(;[ST*Lqo"ir@,iVF"C.G'>#9M&5C>-pC.?&r>@14'+2S#-F+Q6BOKi.rA+;bhY/hbPs7=+*Z`6C@#nlSk*1gL,Bljm[A/r'kdb+Y%J/D>D;HEZMu$<HX<3u:4(*UFn.6AD&2,lV3q<"<</?oX<iISkrU_FP7+5/V*cWLT^V]P@u@oKsuY8Xbl7D"FC^93TlBa?mq@`drr%\.#(d&]YlLb7uAO]BkK7r=OE\@o8V-#=ChsU<'PB$2/=6\!eks+4B4K5+@5Sd%oC,D@t<;g^FVb.)R]40i;W
sIX+Vt`7#)"H-Fk=0#<^C...@fuZ-a>(O),Cj"C-^bq-Y2%),,5&^`Kl/^aaM8AFi%PK8G$:b-)<k\IGHpr)Thq@EdE=i/P/eMp;3),qdVRsg@$UtYo`H4]8X(d0S]a/Sp6X@8N8nZ=.MV$,Q<_%:e3np'9dJYeKc::5N$.\Q8bZ%Sr7>;L0Wfu@T/@sJr_m\M_M481b8>P1QB[o\YC2IUsrZP"O[h/rfKVW5&)i=.<Dq-h^W^@s"&6_N5.*i,:QC/1\KE+"-OZ$P@ghX&pl_maHDA@*dA"M&]4/\g8KH\_S#@pP5BUKP[*Q_)uCpi&e13Zn_p9`.7kh+G2T*jLC#q2bGfq@CcBCU`.+WKUaRgoLh%CK"ag<gnO)Ho;?pi(j@Zb<nXonSg'GcE8+\I<\ZDp.46*Hkl9uLTAO4N&)-.8`1ucR7E3XeWAV$Z1[PdDdH+2U@=g"_/rQQ7[nhHZZ=e1]M1`t9M8PW9$f2*`(Rg@"Cik/o?1'gUp]ej7eVN`nFo%3=^Gb7bi,gbis_$Podj0dl7q^9P65TO%KVe:(%:=IcgZNIPC/9g2NaY^H^%!R4dhc$)-2a_LPkpgR,E:r.YE1;C`!B8%^n_jQ5*$QoEeV;fN2jaU4N;m`Apq_3Ur1<>#Sb>r4?+QH,]9#rjp=^f.HEIW*IYsWFeurhQot;fEgdlEoX/gBb2-(*4PL@fB8SWt,N]!]-i6_KpfRc@b'7"&D;#@rf7kXNZ6C&mm#b.$%JZbhZ3iu'qk_iK-j^1TO%0tj>Lbqc*^I";WVI,75'hkgsHs[D3cbctJ4F/9JiEM?$8cM6"pgF),8,Y#3lPd[mICC^9L2OPE@>Oft?n*l9%ePSujBpPjDIt,G9qtE7."moT\EKEO-4N(=K6h37Aq(>2H5"EZfML
dMRk=_6coA<>_])*Oo!AM;>VlAmLs&Fm@bN3U7:!7b6E-_oD4fVoR_:!c6^3ILF3W>NpC@:KEuY~>
+GauHM95iiK&AJ$C#^[s4+Aqcse_=ur/9]E.+%CUUHXJ,A(01s$PjHZ0n)unZ;6guiM?&L4Lu^MPb^;4B5O:9mm5D-e6f/)P_q++fNbR'o>pJ!:RQ,!(s8;8Z[L!Aucofp2hi:ojIPb?dZlMk[m:GnTk/2*.o^$@*rPC2D(trC#/&74F[8S(b?MCg4VYtXMlM'#-eLYe9.?F8UEVQ'"*/t;fYu9FoIqu[BXU/UGo#D6%mH@d#lQOsT<i:aYc*UYB'TH\hNo,HA*>:I$(_pJEn[q7cGb!h7]i#m`_M#de$2h;gh`n%bO7:rpo?UFXF#<R6KhMjG!ml^*MoX.^75YRBi-;jZ5G8%!4AmYfX_r8\6qJA>6*-^;.,l]>L[i20j\-iu@?J__/Jko)MpiVN\:ODH*6c'-6f`M,CD"^eRdQ2HrE*[rYeo2a0$N.7(!7aO<K+G=WuKkV(PZEEOekTTWY.D`P*Eujqe"VhnW^1Ej4jF=6hC;q6G1,kBQ,)$6rK=5=%D"XG%Sg4@+%#r*,r6+I)'6b(e6;L%LF71$otUE.#L#0;W2b5ZtJT/BCsD=*/q\B5iF)JK4%hOU-</aTje6Z(X`PSOK/qL\_&mX1PX;17<W-Onq&0\%1e/HN^"qRg8tkg,2.drD0r?qkeuH39Y$=,0n%6q=IKM"P@ZT#'NTc+pZX"!CR#/H+kj+kD0`3:mh!7e#mVLu++/K3,-I`<G!sJmi3>D=VVOq3_FQ'r`h4JgPABCh&q6ZT-l'N(Jl)R0o()]`Uh;;OgoU*!O%#='dhRt^r_VbCEl_Xj*(l()U9-AMpNk,f?j6S8F!9&\_%)&AAD!kRiZAq&jT#JlL*J/1(R8)NN!/,-1Rr'Jash)O]@N'=5BPnJUe-E]2D7\:UfC]X/9DkH*/KE,b7Mf:EQk\t>[\8YbKdWM+2Oj4(580"0I0UKM@<^N?k<!RX3!-q+\b/^ZUs0Z9/iiYY$6Rd*&dtP4j*7e;bU.
oKO5d!0(JQ866<J@^Itflk@h9)&:?N;aai=YBiT)^^F._sF,%8GLoW@$!VXCI0,GrZMS6'3h_4U[+i>dU>,YaT_&k81M=[0ggCbjM@hXfBbO&^(kOBf5753aNi_U(T*92^R4%ViiT;:,&n0#7pq4UP#bT)H\bc-7pLp4'e-UK&g^IM$pE3LW;lG6f:dVOF"AlnlCALl=VIXd](Q4rD"@*0,nP;ilh-h"&KW-Q>=&JYXEk[S(BcD-g2`;^(tN7RQs[+o_"%E=Kf4Bu\01/.0LB6+Z>Q%3HMT4OnI3A#I)6\(E4COe\H6/"Q/BYd25-7EHNG3iFEcMjGIDOqI8AU,Q?$$iC3qd;[P@t2p#<Dm:eVZg39Z.oF7+Zr)Y^-`ji01VBGSjmaM:RRB(*Gf6#,YXp5P9iD_1bL)R7*Z9IPk6X1#AH3KDh[T@G`MR&<1O`",o)On_mt:.J2i#!S6P::b_TM<[P8g[+A!LQ)=NC\jY`C4F`_9/<Ed*",,d&+q)lR[@?!bS3#jQ:n$4L+1u#Hn>qPNR].D,_oq9'&,?6p^ZT5'B&te=(=s1qdC@)psUhg^\\3ZYZN(jMMl+!(7Crhj(AjQFm]`mlrabBqESKg)pZ"UdNS7qpj3?"h`lhL*g0$n=L1!T(#ln-Cd\Pk8CD)]?Qi6V-s-fiP!>>_thgC.=Mpa4d.i'G0'EDLtl!'5nVMJfhqG5Vjs5We"URgFNthC?:<qd$,5'MFd1VX#kq'U?@TM1qPeJr62[B!q<4)J+>8$7@c1SCm+A?#kqT!oKe1oM:WR@C0O(Bdbt558(CI&Ca+>=<c7DDu#O=I>Et2#q<aRjB\Eol'P3r'*nB.Q"BbmdV$H`3$0?hdd""IVNL,pU0n/RlT3qT"5gGhC^uLIa_:I8@sHFOd4mhPJ(IPIMpf2Vn9*XU8qWgADI"+=^+bpHb^fkE@L)]FG+b>XaC*J1;[Wr+jZ>*kk,(]Pcde[0R[2Xa6_*"$E]>
rkqV.l?J.a]!/Apts;3sE4!&<)aIkTgPdZp3na`C>2XL_6nBNj/'[tA:2M8g+'inRcpp;Hn3a`MS6~>
endstream
endobj
76 0 obj
@@ -547,10 +547,10 @@
>>
endobj
95 0 obj
-<< /Length 1540 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1581 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gatm<gM...@r>,%Me?o=GXi<Eh\7+@Cj;FKR"EcXF0b^A!i0mLcs07\')]$]"gX%]0H^=(:#AUn9eeK?-XhhNrpB0K$%PQdf.#F%uU4R)(XF'h#YLH]:W9XL#J>^Tk=Mn-rjSoP10PO9B=&^,P[UM*jhkRcnYS+a-!ELLNp&>D"?a:7<<kg^8>K_6![e#C4QS@p0Mdh+S"pB-RIl6"EdEh.Z@mad"WE?\C[6b77D*KkMO'cef1G']/plYbBMqVt
fU%q%+ed;<ZF']sN@.EM+k<!#3efkq6SPisj,4MmY>.7F4O(kSGg8*3grU9]HgJ<W",(QZUKVGT+I$CF`+*dX+Lp?qRrA=&WHK0tqrq+T"ekq*.'QnP_P!.^&]ADA^*Y'1a/l@S#QlI9MC(3?nGR`;E?"BD&D3c'd<[gQ:!7<Lg5f=7,7VXpk!`hN?`K%!(=pT/!^r8oY<<k2%Io4bTQlm=*2ck,]8l5A=]bK"#1aC<Z3VI\9\-c^[pTBbR\[$Kj4]^*%YDfS9/`&)BGJ)N'EFg6bn2>/7WO]1p*a&gG(S?U+k]S*W6:<nGhm4]Dig)h"Z5L1%LmpT*`(O)"5<OL!d2%r<B^D4ZH6fm;<)9eVNehn!]?b_5G>52??P2up?'%a8W4,GY<]2F:*uX#&0V:>l,=48af,^]m'6>(d,X+Nn`&>%[*.T&>s2ZCLcQiuLp_*n0'VuE7P#-#q'[%"rpKSN(L\>&3PP0e=`MQ(O5;K>Ss,IO"]!f9`CO%o<<TMeRUBlsj<?_Lfb0i+Mh[O8"FK6M<b,($Oht,,YkP~>
+Gatm<gM...@P>\Zc^^L]LO&>Li`]<F<$CpeKG3[B8P;>MDT_mrK?@eO?o,@fq<EXhPeBT'.pk^t94O;C\8Vb=\H3['g>Oki8#aq.t0[<OI?Y++N?
SY#1-GWMsP7/85HZjed<M=:5u*7o@t:,q)&TcJp3*W6-$`(s0(;X=OGO"XQZ[Bs;i)Oc$h#;JQl_Ubc1IWXDc3$9P/.>=%nK<a$o2=r#ooh@I0q:i,\69Kf:Pc(iKQE>&/"VghX(ol&t?Z0,+kDg_&PO'_^B,6XdGHc@MborVla]:6mZJ`GH3MNA71(:&6;_AYsEJ;i+5>3AJ@j9E!aOsGL,(l^Qf;2F4oVkaIsX.Pbf7jT<1"=ZUo8daaV'&M=Ai_bOWJlmQ\r2@PBN06-d,qClb4]3$:Z.a'QMFK#Z>q,)\Ab3pAPuXBKN3+]ahC[o7D)u%W7m/C-RYT['5:7Ou%f.!6ZT[Mq+U]]-*O>/0P?r5Z*^sBG>\_3"+&h1<LqYj"8C83:Uc%kj?I``6#$"*Z6m7+beTX`i<rX<0Hb(>fNj@AY=^0RXLtsi%f3pj_g.-g18oHa_@jgDlU,Y2"rku:S1E:ocA%uT;b%D>a#6)Jk)+.!:]U5_dT47Vigcnlnp7]#4UUW<n_Q[_dh[`HI`4r_]6J&R\j[L:eJ!=YoDA3-"k)kP:Z91(*`chmG.c%,Fk2FfYmVd][@1r~>
endstream
endobj
96 0 obj
@@ -1206,158 +1206,158 @@
xref
0 153
0000000000 65535 f
-0000054446 00000 n
-0000054652 00000 n
-0000054745 00000 n
+0000054489 00000 n
+0000054695 00000 n
+0000054788 00000 n
0000000015 00000 n
0000000071 00000 n
0000001333 00000 n
0000001453 00000 n
0000001639 00000 n
-0000054897 00000 n
+0000054940 00000 n
0000001774 00000 n
-0000054960 00000 n
+0000055003 00000 n
0000001909 00000 n
-0000055026 00000 n
+0000055069 00000 n
0000002046 00000 n
-0000055090 00000 n
+0000055133 00000 n
0000002183 00000 n
-0000055156 00000 n
+0000055199 00000 n
0000002320 00000 n
-0000055222 00000 n
+0000055265 00000 n
0000002457 00000 n
-0000055288 00000 n
+0000055331 00000 n
0000002594 00000 n
-0000055352 00000 n
+0000055395 00000 n
0000002731 00000 n
-0000055416 00000 n
+0000055459 00000 n
0000002868 00000 n
-0000055482 00000 n
+0000055525 00000 n
0000003005 00000 n
-0000055547 00000 n
+0000055590 00000 n
0000003142 00000 n
-0000055613 00000 n
+0000055656 00000 n
0000003279 00000 n
-0000055679 00000 n
+0000055722 00000 n
0000003416 00000 n
-0000055744 00000 n
+0000055787 00000 n
0000003553 00000 n
-0000055810 00000 n
+0000055853 00000 n
0000003690 00000 n
-0000055874 00000 n
+0000055917 00000 n
0000003826 00000 n
-0000055938 00000 n
+0000055981 00000 n
0000003963 00000 n
-0000056004 00000 n
+0000056047 00000 n
0000004100 00000 n
-0000056070 00000 n
+0000056113 00000 n
0000004237 00000 n
-0000056135 00000 n
+0000056178 00000 n
0000004373 00000 n
-0000056201 00000 n
+0000056244 00000 n
0000004510 00000 n
-0000056265 00000 n
+0000056308 00000 n
0000004647 00000 n
-0000056331 00000 n
+0000056374 00000 n
0000004783 00000 n
-0000056397 00000 n
+0000056440 00000 n
0000004920 00000 n
0000005673 00000 n
0000005796 00000 n
0000005872 00000 n
-0000056461 00000 n
+0000056504 00000 n
0000006004 00000 n
-0000056527 00000 n
+0000056570 00000 n
0000006137 00000 n
-0000056591 00000 n
+0000056634 00000 n
0000006270 00000 n
-0000056656 00000 n
+0000056699 00000 n
0000006403 00000 n
-0000056721 00000 n
+0000056764 00000 n
0000006536 00000 n
-0000056786 00000 n
+0000056829 00000 n
0000006669 00000 n
-0000056851 00000 n
+0000056894 00000 n
0000006801 00000 n
-0000056916 00000 n
+0000056959 00000 n
0000006934 00000 n
-0000009083 00000 n
-0000009191 00000 n
-0000011342 00000 n
-0000011450 00000 n
-0000013773 00000 n
-0000013881 00000 n
-0000016699 00000 n
-0000016807 00000 n
-0000018950 00000 n
-0000019058 00000 n
-0000021696 00000 n
-0000021804 00000 n
-0000023913 00000 n
-0000024021 00000 n
-0000025962 00000 n
-0000026070 00000 n
-0000028424 00000 n
-0000028532 00000 n
-0000030300 00000 n
-0000030408 00000 n
-0000032041 00000 n
-0000032149 00000 n
-0000033767 00000 n
-0000033875 00000 n
-0000035794 00000 n
-0000035903 00000 n
-0000037738 00000 n
-0000037848 00000 n
-0000039739 00000 n
-0000039849 00000 n
-0000041940 00000 n
-0000042050 00000 n
-0000043615 00000 n
-0000043725 00000 n
-0000045456 00000 n
-0000045566 00000 n
-0000047461 00000 n
-0000056981 00000 n
-0000047571 00000 n
-0000047771 00000 n
-0000047989 00000 n
-0000048195 00000 n
-0000048403 00000 n
-0000048571 00000 n
-0000048771 00000 n
-0000048929 00000 n
-0000049104 00000 n
-0000049367 00000 n
-0000049608 00000 n
-0000049737 00000 n
-0000049891 00000 n
-0000050045 00000 n
-0000050189 00000 n
-0000050339 00000 n
-0000050480 00000 n
-0000050715 00000 n
-0000050910 00000 n
-0000051150 00000 n
-0000051332 00000 n
-0000051505 00000 n
-0000051708 00000 n
-0000051896 00000 n
-0000052148 00000 n
-0000052289 00000 n
-0000052498 00000 n
-0000052684 00000 n
-0000052858 00000 n
-0000053103 00000 n
-0000053294 00000 n
-0000053500 00000 n
-0000053666 00000 n
-0000053780 00000 n
-0000053891 00000 n
-0000054003 00000 n
-0000054112 00000 n
-0000054219 00000 n
-0000054336 00000 n
+0000009085 00000 n
+0000009193 00000 n
+0000011344 00000 n
+0000011452 00000 n
+0000013775 00000 n
+0000013883 00000 n
+0000016701 00000 n
+0000016809 00000 n
+0000018952 00000 n
+0000019060 00000 n
+0000021698 00000 n
+0000021806 00000 n
+0000023915 00000 n
+0000024023 00000 n
+0000025964 00000 n
+0000026072 00000 n
+0000028426 00000 n
+0000028534 00000 n
+0000030302 00000 n
+0000030410 00000 n
+0000032084 00000 n
+0000032192 00000 n
+0000033810 00000 n
+0000033918 00000 n
+0000035837 00000 n
+0000035946 00000 n
+0000037781 00000 n
+0000037891 00000 n
+0000039782 00000 n
+0000039892 00000 n
+0000041983 00000 n
+0000042093 00000 n
+0000043658 00000 n
+0000043768 00000 n
+0000045499 00000 n
+0000045609 00000 n
+0000047504 00000 n
+0000057024 00000 n
+0000047614 00000 n
+0000047814 00000 n
+0000048032 00000 n
+0000048238 00000 n
+0000048446 00000 n
+0000048614 00000 n
+0000048814 00000 n
+0000048972 00000 n
+0000049147 00000 n
+0000049410 00000 n
+0000049651 00000 n
+0000049780 00000 n
+0000049934 00000 n
+0000050088 00000 n
+0000050232 00000 n
+0000050382 00000 n
+0000050523 00000 n
+0000050758 00000 n
+0000050953 00000 n
+0000051193 00000 n
+0000051375 00000 n
+0000051548 00000 n
+0000051751 00000 n
+0000051939 00000 n
+0000052191 00000 n
+0000052332 00000 n
+0000052541 00000 n
+0000052727 00000 n
+0000052901 00000 n
+0000053146 00000 n
+0000053337 00000 n
+0000053543 00000 n
+0000053709 00000 n
+0000053823 00000 n
+0000053934 00000 n
+0000054046 00000 n
+0000054155 00000 n
+0000054262 00000 n
+0000054379 00000 n
trailer
<<
/Size 153
@@ -1365,5 +1365,5 @@
/Info 4 0 R
>>
startxref
-57035
+57078
%%EOF
Modified: lucene/java/branches/flex_1458/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/gettingstarted.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/gettingstarted.html (original)
+++ lucene/java/branches/flex_1458/docs/gettingstarted.html Mon Nov 16 21:24:41 2009
@@ -72,7 +72,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -212,6 +212,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
Modified: lucene/java/branches/flex_1458/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/index.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/index.html (original)
+++ lucene/java/branches/flex_1458/docs/index.html Mon Nov 16 21:24:41 2009
@@ -70,7 +70,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -210,6 +210,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
@@ -259,7 +262,7 @@
<h1>Lucene Java Documentation</h1>
<p>
- This is the official documentation for Lucene Java 2.9 <BR>
+ This is the official documentation for Lucene Java 3.1 <BR>
Please use the menu on the left to access the Javadocs and different documents.
</p>
Modified: lucene/java/branches/flex_1458/docs/index.pdf
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/index.pdf?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/index.pdf (original)
+++ lucene/java/branches/flex_1458/docs/index.pdf Mon Nov 16 21:24:41 2009
@@ -1,5 +1,5 @@
%PDF-1.3
-%ª«¬
+%����
4 0 obj
<< /Type /Info
/Producer (FOP 0.20.5) >>
@@ -8,7 +8,7 @@
<< /Length 455 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gasak9iHZu&A@Zcp=LFF+XBmEXkH._K9"0#:_+/$P*(pMLQ;Dk!&E5fG/iJ@D`?ADp@1%DE4LsYEC(ht!?GKl5[baf5i!)?3n.V68JJ?N42B>)[a.sUQ>j['Q0U#Fnj@_FD=db"l:uNBek:7=D!*2LKP[ABR4FGR`0=&=ZdQ4u*&2ONpq&&A#?GW()d2u/ECr6X[;A%qU*i']Se*-G#BuGr/NVTqE$E8`p./;6k#eI%LKaDlPuB&>:AF1/b]D=+gOE&f2F_Od(W[#[[;)3N^\qlgT?KDACh?uiKc+.nLV<Hf3D$*2Y8*47cFNIYhTRP3-4A\N[#I[ERZKo;+4!g$">gI-E$&nNPVUj_;n?EE(FZ)Q&1!5=U_+3\[)nRrIPk_EG!;A@9S=HA8n3pf&g_jPPW?_o<d11A6'\S>lXD](TPIQh_8tFVXBO/%Vuj+#%@(,JeG~>
+Gasak9iHZu&A@Zcp=LFF+XGDU>IB6H#9B6&TH5:&,pO_$%it\`!G&KpG/iJ@D`?ADp@5S*E4LmWEC(i!!UX5s5iE9-5i!*j]!')COsjX&HA&38D3q4o/`D:-/(\"ljbNKlg1K/<<NU(sXd8GXl/#8C#h_a'Rk'YT`0?=(e&!s?*78sGpq&,B#?GW()-Qf.5,Xpng=@<id3G5NO!l3G#C!#-%6E3O0U(Ke4!^mgF0&?P74nDsb1qi@'0\E"ZV37>p@"9YNDWn\3ASKcX_R%=Dgr\r-SpehS!Z-[DL*-!@5%UG:6I'fCPcSjF)F+/2_tcN8V?a\D1e"5-6s2=LNA\6!OVtLg]uRtV9JV1Pce-*"U\rl"BibHee&M9\B1"!IF[IVZp'r)9S=HA8n3q1![W/6Or;7M<k"^,7[9P3WdHLRTPJ-'_8+kLX;Y)gW#Vr=%>6Fdc2~>
endstream
endobj
6 0 obj
Modified: lucene/java/branches/flex_1458/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/linkmap.html?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/linkmap.html (original)
+++ lucene/java/branches/flex_1458/docs/linkmap.html Mon Nov 16 21:24:41 2009
@@ -70,7 +70,7 @@
<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">Lucene 2.9 Documentation</a>
+<a class="selected" href="index.html">Lucene 3.1 Documentation</a>
</li>
</ul>
<!--+
@@ -210,6 +210,9 @@
</div>
</div>
<div class="menuitem">
+<a href="systemrequirements.html">System Requirements</a>
+</div>
+<div class="menuitem">
<a href="contributions.html">Contributions</a>
</div>
<div class="menuitem">
@@ -488,6 +491,12 @@
<ul>
<li>
+<a href="systemrequirements.html">System Requirements</a> ___________________ <em>systemrequirements</em>
+</li>
+</ul>
+
+<ul>
+<li>
<a href="contributions.html">Contributions</a> ___________________ <em>contributions</em>
</li>
</ul>
Modified: lucene/java/branches/flex_1458/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/linkmap.pdf?rev=880963&r1=880962&r2=880963&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/linkmap.pdf (original)
+++ lucene/java/branches/flex_1458/docs/linkmap.pdf Mon Nov 16 21:24:41 2009
@@ -1,5 +1,5 @@
%PDF-1.3
-%ª«¬
+%����
4 0 obj
<< /Type /Info
/Producer (FOP 0.20.5) >>
@@ -20,10 +20,10 @@
>>
endobj
7 0 obj
-<< /Length 1123 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1167 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-GatUt?#S1G'Sc)R.rkq42?&CrElfYcKKs"B&kIP7Qb$I)RWNF>ftYT'C?$#[P1O!1X?#`ZpH:\f\QR57/80\jJC/C#K@+:c,&$sPKLou41<KTLEO=Ljhd?>tR(eUC#Z5:7p$1Q\.rl;%fS7-n5HgiSdIMpP?mgdSI1-E)"PX!mjWD%5Z?]K9[Ee7(7AnK[Tbg:H7`%IX@/Qh/Q$s3t6jXu<fEtQuD(jkC6ipa4A\QJi;92X8LOCjmbRJB)$XLOd,qg`B&c`rNG6asc'b6)!J[?/hN),(Z&!JA+>et6*G2.eDV;<`YB09b!9j5\/#$biP<Q@]r#-X)LG(&_7X./cFn&@aseel$4rC(SQhsgIUJ2'.c'NB8X5"+`qp(pXH[<ds<Rbbn`*3FPo+!l#U3\@Dm]e#%K:>D@Nbgr/%mS>#JdTF"rSaL$ZbA^:2>#7lO!d)fYEH:8Z%I).XBA%p[*ZL/qQ;Rbs@EVo]Ncf`b'KKqX4_S+Ab#PqTYUQL&f!qA9M>0UJG*Z*Rbfe7hWh*^)hu^5`n1c-H/?#cJA%kmB>_[/E#>'MaOX]J`XQ!Y7$#u9\f1N5=<PN'48;+2n/k?3V+"*,?-2$ZSa)aK2gY753).=`l%W*lK/A,1*]Ai(igS/IsF)OQ9X9FR=hS/B?*pUBfK1??eblrc;U!1gKA&N8'0AbOhP7]cK^6VQD)X)A5+tqI!(5ke'AKAL+N#ON\$a,K+Hp&bKTOQk<n9\0eh9jd%VR=p]$9iJ:(ZpZa[Usrd.t,*Xoq[O-Rt5jh;<;IqHWp],$J<pl-!@Sn6Q,]>A*0k]afLsqQaI6n$_-EqSg#`%Y/'d[@NR)^mR\ob^J9%N,'!A(BM%QGS3AQHS2m'hBdGF5C+K1d:"S9R,6?fgX<93R\7ogd-f$@ghTj61RkpBeCeU4_O'B0$XtAa`@=P=]>@HPk<LsQjh/`5=51Cqh+u4tERLuA&+M]h^.U(0dAiIt=!&VZj#*0$
&,r#rn)&gZ;f#OOs,1sY!0WX4g*PG*2P_+S9aAaY+W(V8;m@JI7H)TJFU=o8_R%eYT+_9bLq4Q$LgRZR.EE]L1UXZ%hMe:7tc"R\X\$[H0+10c!;63IcqP.*L]QaAU0:t)u~>
+GatUtgMYb*&;KZP'Y8*6biM,Qkcuf*"Vr\oM%"KWm:*oQ[%iU33L!e#DnjdN(?NsIki?KCB`=(B5;SNfXr"jTBS8'id<`E...@qcJGu>H3Is5#g"tS>WO64Itu89B,qNf93)QS/s:.KX6Wk0md8->M2eX]&=,=#nYEY3!,;"RurYKdbg5Mh<>u%1FY<$`e8X5ZBkg^g0-ZTp4$(H.r:b;l,'(
EMq@Aq7+*6I?/sESXP*XU9I$[6mG_REZ2Jisk*XZV&OE-:#(e5_(u3g@Gd:!Gqi-/=FZcOb0-H'KO>%T@^4J'(;gkYUB:\L_RkC=Hp\d1NkRq;0fd0fdX%Vs@+L>dP<nla^p#O8q4WV\RgOmUbh2BAdFP?C5<bCLn:`FB,]Dhml*+R\~>
endstream
endobj
8 0 obj
@@ -87,19 +87,19 @@
xref
0 14
0000000000 65535 f
-0000003209 00000 n
-0000003273 00000 n
-0000003323 00000 n
+0000003253 00000 n
+0000003317 00000 n
+0000003367 00000 n
0000000015 00000 n
0000000071 00000 n
0000001225 00000 n
0000001331 00000 n
-0000002546 00000 n
-0000002652 00000 n
-0000002764 00000 n
-0000002874 00000 n
-0000002985 00000 n
-0000003093 00000 n
+0000002590 00000 n
+0000002696 00000 n
+0000002808 00000 n
+0000002918 00000 n
+0000003029 00000 n
+0000003137 00000 n
trailer
<<
/Size 14
@@ -107,5 +107,5 @@
/Info 4 0 R
>>
startxref
-3445
+3489
%%EOF