From 472c7e1ff93e2de66c69e5d7b6667aa023141ecd Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 17 Nov 2011 14:20:18 +0000
Subject: [PATCH] again fix some formatting I broke! and remove unused imports

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1203199 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/archiva/rest/api/model/GroupIdList.java     | 7 ++++---
 .../rest/api/services/ArchivaRestServiceException.java     | 4 +---
 .../rest/api/services/ManagedRepositoriesService.java      | 1 -
 .../org/apache/archiva/rest/api/services/PingService.java  | 1 +
 .../archiva/rest/api/services/ProxyConnectorService.java   | 1 -
 .../apache/archiva/rest/api/services/SearchService.java    | 2 --
 .../org/apache/archiva/rest/services/ArchivaRestError.java | 6 +++---
 .../archiva/rest/services/DefaultRepositoriesService.java  | 2 --
 .../rest/services/interceptors/HttpContextThreadLocal.java | 3 +--
 9 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/GroupIdList.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/GroupIdList.java
index 87a1643c3..fec07f4dd 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/GroupIdList.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/GroupIdList.java
@@ -31,12 +31,13 @@ public class GroupIdList
     implements Serializable
 {
     private List<String> groupIds;
-    public GroupIdList (  )
+
+    public GroupIdList()
     {
         // no op
     }
 
-    public GroupIdList ( List<String> groupIds )
+    public GroupIdList( List<String> groupIds )
     {
         this.groupIds = groupIds;
     }
@@ -46,7 +47,7 @@ public class GroupIdList
         return groupIds;
     }
 
-    public void setGroupIds(List<String> groupIds)
+    public void setGroupIds( List<String> groupIds )
     {
         this.groupIds = groupIds;
     }
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java
index 3d0de5cb1..6e4997ca5 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java
@@ -18,8 +18,6 @@ package org.apache.archiva.rest.api.services;
  * under the License.
  */
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 /**
  * @author Olivier Lamy
  * @since 1.4-M1
@@ -29,7 +27,7 @@ public class ArchivaRestServiceException
 {
 
     private int httpErrorCode = 500;
-    
+
     private String errorKey;
 
 
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java
index cfe0ebad1..c9f174b31 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java
@@ -81,5 +81,4 @@ public interface ManagedRepositoriesService
         throws ArchivaRestServiceException;
 
 
-
 }
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java
index c629bf341..49f15cdeb 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java
@@ -47,6 +47,7 @@ public interface PingService
 
     /**
      * same as #ping but check authz
+     *
      * @return
      */
     @Path( "pingWithAuthz" )
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
index 2b88bd2a6..c1a44eee9 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
@@ -76,7 +76,6 @@ public interface ProxyConnectorService
      *
      * @param proxyConnector
      * @return
-     *
      */
     @Path( "updateProxyConnector" )
     @POST
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java
index 46512b832..23eb5b0c2 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java
@@ -21,7 +21,6 @@ package org.apache.archiva.rest.api.services;
 
 
 import org.apache.archiva.rest.api.model.Artifact;
-import org.apache.archiva.rest.api.model.Dependency;
 import org.apache.archiva.rest.api.model.GroupIdList;
 import org.apache.archiva.rest.api.model.SearchRequest;
 import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
@@ -32,7 +31,6 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import java.util.Collection;
 import java.util.List;
 
 @Path( "/searchService/" )
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
index 6ae2a2c7d..173077373 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
@@ -31,14 +31,14 @@ public class ArchivaRestError
 {
 
     private String errorKey;
-    
+
     private String errorMessage;
-    
+
     public ArchivaRestError()
     {
         // no op
     }
-    
+
     public ArchivaRestError( ArchivaRestServiceException e )
     {
         errorKey = e.getErrorKey();
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index f06bed640..c9fe58836 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -81,8 +81,6 @@ import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java
index 43180d838..8ec1cab1d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java
@@ -24,8 +24,7 @@ package org.apache.archiva.rest.services.interceptors;
  */
 public class HttpContextThreadLocal
 {
-    private static final ThreadLocal<HttpContext> userThreadLocal =
-        new ThreadLocal<HttpContext>();
+    private static final ThreadLocal<HttpContext> userThreadLocal = new ThreadLocal<HttpContext>();
 
     public static void set( HttpContext httpContext )
     {