1.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java	Mon Jul 16 17:32:27 2012 +0200
     1.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java	Mon Jul 16 19:27:43 2012 +0200
     1.3 @@ -94,7 +94,7 @@
     1.4          index.query(new ArrayList<Object>(), new Convertor<Document, Object>() {
     1.5              @Override public Object convert(Document doc) {
     1.6                  try {
     1.7 -                    ByteArrayInputStream in = new ByteArrayInputStream(CompressionTools.decompress(doc.getField("encoded").getBinaryValue()));
     1.8 +                    ByteArrayInputStream in = new ByteArrayInputStream(CompressionTools.decompress(doc.getField("languageEncoded").getBinaryValue()));
     1.9  
    1.10                      try {
    1.11                          Map<String, Integer> freqs;
    1.12 @@ -109,7 +109,7 @@
    1.13                          }
    1.14  
    1.15                          if (matches) {
    1.16 -                            result.put(doc.getField("path").stringValue(), freqs);
    1.17 +                            result.put(doc.getField("languagePath").stringValue(), freqs);
    1.18                          }
    1.19                      } finally {
    1.20                          in.close();
    1.21 @@ -124,7 +124,7 @@
    1.22              }
    1.23          }, new FieldSelector() {
    1.24              public FieldSelectorResult accept(String string) {
    1.25 -                return "encoded".equals(string) || "path".equals(string) ? FieldSelectorResult.LOAD : FieldSelectorResult.NO_LOAD;
    1.26 +                return "languageEncoded".equals(string) || "languagePath".equals(string) ? FieldSelectorResult.LOAD : FieldSelectorResult.NO_LOAD;
    1.27              }
    1.28          }, null, query(pattern));
    1.29  
    1.30 @@ -145,7 +145,7 @@
    1.31                  PhraseQuery pq = new PhraseQuery();
    1.32  
    1.33                  for (String s : c) {
    1.34 -                    pq.add(new Term("content", s));
    1.35 +                    pq.add(new Term("languageContent", s));
    1.36                  }
    1.37  
    1.38                  emb.add(pq, BooleanClause.Occur.MUST);
    1.39 @@ -156,12 +156,12 @@
    1.40              if (additionalConstraints != null && !additionalConstraints.requiredErasedTypes.isEmpty()) {
    1.41                  BooleanQuery constraintsQuery = new BooleanQuery();
    1.42  
    1.43 -                constraintsQuery.add(new TermQuery(new Term("attributed", "false")), BooleanClause.Occur.SHOULD);
    1.44 +                constraintsQuery.add(new TermQuery(new Term("languageAttributed", "false")), BooleanClause.Occur.SHOULD);
    1.45  
    1.46                  BooleanQuery constr = new BooleanQuery();
    1.47  
    1.48                  for (String tc : additionalConstraints.requiredErasedTypes) {
    1.49 -                    constr.add(new TermQuery(new Term("erasedTypes", tc)), BooleanClause.Occur.MUST);
    1.50 +                    constr.add(new TermQuery(new Term("languageErasedTypes", tc)), BooleanClause.Occur.MUST);
    1.51                  }
    1.52  
    1.53                  constraintsQuery.add(constr, BooleanClause.Occur.SHOULD);

     2.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java	Mon Jul 16 17:32:27 2012 +0200
     2.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java	Mon Jul 16 19:27:43 2012 +0200
     2.3 @@ -115,14 +115,14 @@
     2.4  
     2.5              BulkSearch.getDefault().encode(toProcess, ec);
     2.6  
     2.7 -            luceneWriter.deleteDocuments(new Term("path", relative));
     2.8 +            luceneWriter.deleteDocuments(new Term("languagePath", relative));
     2.9  
    2.10              Document doc = new Document();
    2.11  
    2.12 -            doc.add(new Field("content", new TokenStreamImpl(ec.getContent())));
    2.13 +            doc.add(new Field("languageContent", new TokenStreamImpl(ec.getContent())));
    2.14              out.close();
    2.15 -            doc.add(new Field("encoded", CompressionTools.compress(out.toByteArray()), Field.Store.YES));
    2.16 -            doc.add(new Field("path", relative, Field.Store.YES, Field.Index.NOT_ANALYZED));
    2.17 +            doc.add(new Field("languageEncoded", CompressionTools.compress(out.toByteArray()), Field.Store.YES));
    2.18 +            doc.add(new Field("languagePath", relative, Field.Store.YES, Field.Index.NOT_ANALYZED));
    2.19  
    2.20              if (services != null) {
    2.21                  final Set<String> erased = new HashSet<String>();
    2.22 @@ -153,7 +153,7 @@
    2.23                      }
    2.24                  }.scan(toProcess, null);
    2.25  
    2.26 -                doc.add(new Field("erasedTypes", new TokenStreamImpl(erased)));
    2.27 +                doc.add(new Field("languageErasedTypes", new TokenStreamImpl(erased)));
    2.28              }
    2.29              
    2.30              luceneWriter.addDocument(doc);
    2.31 @@ -179,7 +179,7 @@
    2.32          String relative = access.getRelativePath(indexable);
    2.33          
    2.34          try {
    2.35 -            luceneWriter.deleteDocuments(new Term("path", relative));
    2.36 +            luceneWriter.deleteDocuments(new Term("languagePath", relative));
    2.37          } catch (CorruptIndexException ex) {
    2.38              Logger.getLogger(Indexer.class.getName()).log(Level.WARNING, null, ex);
    2.39          } catch (IOException ex) {