organize imports

7 files changed, 13 insertions, 30 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java b/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java
index c9fee84..e7dab91 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java
@@ -1,17 +1,14 @@
 package org.fedoraproject.candlepin.api;
 
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.log4j.Logger;
-
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Organization;
 import org.fedoraproject.candlepin.model.User;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class ApiHandler {
     
     private static ApiHandler instance = new ApiHandler();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
index 3994cbc..15ca1d9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
@@ -14,13 +14,12 @@
  */
 package org.fedoraproject.candlepin.api;
 
-import org.fedoraproject.candlepin.model.BaseModel;
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.util.MethodUtil;
-
 import com.sun.jersey.api.representation.Form;
 
 import org.apache.log4j.Logger;
+import org.fedoraproject.candlepin.model.BaseModel;
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.util.MethodUtil;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java
index 231ff5a..6ab1b46 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java
@@ -3,18 +3,12 @@
  */
 package org.fedoraproject.candlepin.api.test;
 
-import com.sun.jersey.api.representation.Form;
-
 import org.fedoraproject.candlepin.api.ApiHandler;
-import org.fedoraproject.candlepin.api.ConsumerApi;
 import org.fedoraproject.candlepin.api.OrgApi;
 import org.fedoraproject.candlepin.model.BaseModel;
-import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Organization;
 import org.fedoraproject.candlepin.model.User;
-import org.fedoraproject.candlepin.model.test.OrganizationTest;
-import org.fedoraproject.candlepin.model.test.TestUtil;
 
 import junit.framework.TestCase;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java
index 258467e..a8eb305 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java
@@ -14,14 +14,14 @@
  */
 package org.fedoraproject.candlepin.api.test;
 
+import com.sun.jersey.api.representation.Form;
+
 import org.fedoraproject.candlepin.api.ConsumerApi;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Organization;
 import org.fedoraproject.candlepin.model.test.TestUtil;
 
-import com.sun.jersey.api.representation.Form;
-
 import junit.framework.TestCase;
 
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
index 8fc4291..2a9df17 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
@@ -14,14 +14,10 @@
  */
 package org.fedoraproject.candlepin.api.test;
 
-import org.fedoraproject.candlepin.api.UserApi;
-import org.fedoraproject.candlepin.model.User;
-
 import com.sun.jersey.api.representation.Form;
 
-import org.apache.log4j.Logger;
-
-import java.util.List;
+import org.fedoraproject.candlepin.api.UserApi;
+import org.fedoraproject.candlepin.model.User;
 
 import junit.framework.TestCase;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
index 3814715..16e0a47 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
@@ -14,12 +14,9 @@
  */
 package org.fedoraproject.candlepin.model;
 
-import org.fedoraproject.candlepin.util.MethodUtil;
-
 import org.apache.log4j.Logger;
+import org.fedoraproject.candlepin.util.MethodUtil;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OrganizationTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/OrganizationTest.java
index 70d453d..29172fa 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OrganizationTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/OrganizationTest.java
@@ -14,8 +14,6 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
-import junit.framework.TestCase;
-
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.EntitlementPool;
@@ -26,6 +24,8 @@ import org.fedoraproject.candlepin.model.User;
 
 import java.util.List;
 
+import junit.framework.TestCase;
+
 /**
  * 
  *