add project to the 'S' link in Annotate view

fixes #835

Author: Vladimir Kotal

src/org/opensolaris/opengrok/analysis/JFlexXref.java

@@ -186,8 +186,9 @@ protected void appendProject() throws IOException {
         }
     }
 
-    protected String getProjectPostfix() {
-        return project == null ? "" : ("&project=" + project.getDescription());
+    protected String getProjectPostfix(boolean encoded) {
+        String amp = encoded ? "&" : "&";
+        return project == null ? "" : (amp + "project=" + project.getDescription());
     }
 
     /**
@@ -334,7 +335,8 @@ private Style getStyle(String type) {
     protected void startNewLine() throws IOException {
         int line = getLineNumber() + 1;
         setLineNumber(line);
-        Util.readableLine(line, out, annotation, userPageLink, userPageSuffix);
+        Util.readableLine(line, out, annotation, userPageLink, userPageSuffix,
+            getProjectPostfix(false));
     }
 
     /**

src/org/opensolaris/opengrok/web/Util.java

@@ -482,7 +482,7 @@ public static String encode(String s) {
      * @throws IOException depends on the destination (<var>out</var>).
      */
     public static void readableLine(int num, Writer out, Annotation annotation,
-        String userPageLink, String userPageSuffix)
+        String userPageLink, String userPageSuffix, String project)
     throws IOException
     {
         // this method should go to JFlexXref
@@ -525,11 +525,12 @@ public static void readableLine(int num, Writer out, Annotation annotation,
 
                 out.write(anchorEnd);
 
-                // Write link to search the revision.
+                // Write link to search the revision in current project.
                 out.write(anchorClassStart);
-                out.write("search\" href=\"" + env.getUrlPrefix() +
-                    "defs=&refs=&path=&hist=");
-                out.write(URIEncode(r));
+                out.write("search\" href=\"" + env.getUrlPrefix());
+                out.write("defs=&refs=&path=");
+                out.write(project);
+                out.write("&hist=" + URIEncode(r));
                 out.write("&type=\" title=\"Search history for this changeset");
                 out.write(closeQuotedTag);
                 out.write("S");

test/org/opensolaris/opengrok/web/UtilTest.java

@@ -126,13 +126,13 @@ public void redableSize() {
     @Test
     public void readableLine() throws Exception {
         StringWriter out = new StringWriter();
-        // hmmm - where do meaningful test start?
-        Util.readableLine(42, out, null, null, null);
+        // hmmm - where do meaningful tests start?
+        Util.readableLine(42, out, null, null, null, null);
         assertEquals("\n<a class=\"l\" name=\"42\" href=\"#42\">42</a>",
                      out.toString());
 
         out.getBuffer().setLength(0); // clear buffer
-        Util.readableLine(110, out, null, null, null);
+        Util.readableLine(110, out, null, null, null, null);
         assertEquals("\n<a class=\"hl\" name=\"110\" href=\"#110\">110</a>",
                      out.toString());
     }