Let all web-based queries use \n instead of \r\n - possibly the index itself should do this normalization (either on store or on load)?
authorJan Lahoda <jlahoda@netbeans.org>
Tue, 08 Feb 2011 19:22:21 +0100
changeset 5378969f0506ea5
parent 534 e0a0bdf664c0
child 538 bd83b532f8c3
Let all web-based queries use \n instead of \r\n - possibly the index itself should do this normalization (either on store or on load)?
server/indexer/src/org/netbeans/modules/jackpot30/server/indexer/StandaloneFinder.java
server/web.api/src/org/netbeans/modules/jackpot30/server/webapi/API.java
     1.1 --- a/server/indexer/src/org/netbeans/modules/jackpot30/server/indexer/StandaloneFinder.java	Wed Jan 26 21:11:09 2011 +0100
     1.2 +++ b/server/indexer/src/org/netbeans/modules/jackpot30/server/indexer/StandaloneFinder.java	Tue Feb 08 19:22:21 2011 +0100
     1.3 @@ -93,7 +93,7 @@
     1.4  
     1.5      public static int[] findCandidateOccurrenceSpans(File sourceRoot, String relativePath, String pattern) throws IOException {
     1.6          BulkPattern bulkPattern = preparePattern(pattern, null);
     1.7 -        CharSequence source = FileBasedIndex.get(sourceRoot.toURI().toURL()).getSourceCode(relativePath);
     1.8 +        CharSequence source = FileBasedIndex.get(sourceRoot.toURI().toURL()).getSourceCode(relativePath).toString().replaceAll("\r\n", "\n");
     1.9          JavacTaskImpl jti = prepareJavacTaskImpl();
    1.10          CompilationUnitTree cut = jti.parse(new JFOImpl(source)).iterator().next();
    1.11          Collection<TreePath> paths = new LinkedList<TreePath>();
     2.1 --- a/server/web.api/src/org/netbeans/modules/jackpot30/server/webapi/API.java	Wed Jan 26 21:11:09 2011 +0100
     2.2 +++ b/server/web.api/src/org/netbeans/modules/jackpot30/server/webapi/API.java	Tue Feb 08 19:22:21 2011 +0100
     2.3 @@ -148,7 +148,7 @@
     2.4              throw new IOException("Source code not found");
     2.5          }
     2.6          
     2.7 -        return source.toString();
     2.8 +        return source.toString().replaceAll("\r\n", "\n");
     2.9      }
    2.10  
    2.11      @GET