From 5daade4f7b276c059a1a6f0772a474ab1955bec6 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 15 Sep 2011 13:27:02 +0200
Subject: [PATCH] fix broken build

---
 .../sonia/scm/repository/BlameViewerUtil.java | 12 ++-
 .../rest/resources/RepositoryResource.java    | 96 ++++++++++++-------
 2 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java b/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
index ed3d19f1fd..368948e374 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
@@ -46,6 +46,10 @@ import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.util.AssertUtil;
 
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.IOException;
+
 /**
  * Class description
  *
@@ -95,12 +99,14 @@ public class BlameViewerUtil extends CacheClearHook
    *
    * @return
    *
+   *
+   * @throws IOException
    * @throws NotSupportedFeatuerException
    * @throws RepositoryException
    */
   public BlamePagingResult getBlame(String repositoryId, String revision,
                                     String path)
-          throws RepositoryException, NotSupportedFeatuerException
+          throws RepositoryException, NotSupportedFeatuerException, IOException
   {
     AssertUtil.assertIsNotEmpty(repositoryId);
 
@@ -125,12 +131,14 @@ public class BlameViewerUtil extends CacheClearHook
    *
    * @return
    *
+   *
+   * @throws IOException
    * @throws NotSupportedFeatuerException
    * @throws RepositoryException
    */
   public BlamePagingResult getBlame(Repository repository, String revision,
                                     String path)
-          throws RepositoryException, NotSupportedFeatuerException
+          throws RepositoryException, NotSupportedFeatuerException, IOException
   {
     AssertUtil.assertIsNotNull(repository);
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
index 64f349e5c4..c257ba56c1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -113,6 +113,7 @@ public class RepositoryResource
    * @param securityContextProvider
    * @param changesetViewerUtil
    * @param repositoryBrowserUtil
+   * @param blameViewerUtil
    */
   @Inject
   public RepositoryResource(
@@ -132,6 +133,62 @@ public class RepositoryResource
     setDisableCache(false);
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param id
+   * @param revision
+   * @param path
+   *
+   * @return
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @GET
+  @Path("{id}/blame")
+  public Response blame(@PathParam("id") String id,
+                        @QueryParam("revision") String revision,
+                        @QueryParam("path") String path)
+          throws RepositoryException, IOException
+  {
+    Response response = null;
+
+    try
+    {
+      AssertUtil.assertIsNotNull(path);
+
+      BlamePagingResult blamePagingResult = blameViewerUtil.getBlame(id,
+                                              revision, path);
+
+      if (blamePagingResult != null)
+      {
+        response = Response.ok(blamePagingResult).build();
+      }
+      else
+      {
+        response = Response.ok().build();
+      }
+    }
+    catch (IllegalStateException ex)
+    {
+      response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+    }
+    catch (RepositoryNotFoundException ex)
+    {
+      response = Response.status(Response.Status.NOT_FOUND).build();
+    }
+    catch (NotSupportedFeatuerException ex)
+    {
+      response = Response.status(Response.Status.BAD_REQUEST).build();
+    }
+
+    return response;
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -229,37 +286,6 @@ public class RepositoryResource
 
     return response;
   }
-  
-  @GET
-  @Path("{id}/blame")
-  public Response blame(@PathParam("id") String id,
-  			@QueryParam("revision") String revision,
-  			@QueryParam("path") String path)
-  {
-  	Response response = null;
-  	
-    try {
-    	AssertUtil.assertIsNotNull(path);
-	  	BlamePagingResult blamePagingResult = blameViewerUtil.getBlame(id, revision, path);
-	  	
-	  	if (blamePagingResult != null) {
-	  		response = Response.ok(blamePagingResult).build();
-	  	}
-	  	else 
-	  	{
-	  		response = Response.ok().build();
-	  	}
-    } catch (IllegalStateException ex) {
-    	response = Response.status(Response.Status.NOT_FOUND).build();
-    } catch (RepositoryException ex) {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    } catch (NotSupportedFeatuerException ex) {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    
-    return response;
-  }
-
 
   /**
    * Method description
@@ -540,6 +566,9 @@ public class RepositoryResource
 
   //~--- fields ---------------------------------------------------------------
 
+  /** Field description */
+  private BlameViewerUtil blameViewerUtil;
+
   /** Field description */
   private ChangesetViewerUtil changesetViewerUtil;
 
@@ -548,13 +577,10 @@ public class RepositoryResource
 
   /** Field description */
   private RepositoryBrowserUtil repositoryBrowserUtil;
-  
-  /** Field description */
-  private BlameViewerUtil blameViewerUtil;
 
   /** Field description */
   private RepositoryManager repositoryManager;
-  
+
   /** Field description */
   private Provider<WebSecurityContext> securityContextProvider;
 }