From e1975449f1bf16ccb441632d68e440f3e3704a79 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sun, 4 Apr 2010 13:58:13 +0000
Subject: [PATCH]

---
 .../main/java/org/wamblee/system/container/Container.java   | 2 --
 .../org/wamblee/system/core/DefaultProvidedInterface.java   | 1 -
 .../src/main/java/org/wamblee/system/core/DefaultScope.java | 2 --
 .../component/ConnectExternalProvidedProvidedFilter.java    | 2 --
 .../graph/component/ConnectRequiredProvidedEdgeFilter.java  | 2 --
 .../java/org/wamblee/system/adapters/ClassAdapterTest.java  | 5 -----
 .../wamblee/system/components/DatabaseComponentFactory.java | 1 -
 .../test/java/org/wamblee/system/container/Application.java | 4 ----
 .../java/org/wamblee/system/container/ContainerTest.java    | 3 ---
 .../wamblee/system/core/DefaultRequiredInterfaceTest.java   | 3 ---
 .../org/wamblee/system/graph/CompositeEdgeFilterTest.java   | 6 ++----
 .../ConnectExternalProvidedProvidedEdgeFilterTest.java      | 3 ---
 .../ConnectRequiredExternallyRequiredEdgeFilterTest.java    | 5 ++---
 13 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java
index 3dfda5cf..9669cb21 100644
--- a/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -17,9 +17,7 @@ package org.wamblee.system.container;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
index 2f9aee65..c7905673 100644
--- a/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 
 
 /**
diff --git a/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
index ad4b0986..50c6cc3b 100644
--- a/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
@@ -21,8 +21,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
 
 public class DefaultScope implements Scope {
 
diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java
index 62b1604d..1007ae70 100644
--- a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java
+++ b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java
@@ -17,8 +17,6 @@ package org.wamblee.system.graph.component;
 
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
-import org.wamblee.system.graph.EdgeSelector;
-import org.wamblee.system.graph.Node;
 
 /**
  * Filter used to explicitly connect required and provided interfaces within a
diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java
index f04b381f..a1d2481f 100644
--- a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java
+++ b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java
@@ -17,8 +17,6 @@ package org.wamblee.system.graph.component;
 
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
-import org.wamblee.system.graph.EdgeSelector;
-import org.wamblee.system.graph.Node;
 
 /**
  * Filter used to explicitly connect required and provided interfaces within a
diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java
index e08190e9..5e4f868f 100644
--- a/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java
@@ -15,15 +15,10 @@
  */ 
 package org.wamblee.system.adapters;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.wamblee.system.container.Container;
 import org.wamblee.system.core.Component;
-import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
-import org.wamblee.system.core.RequiredInterfaceComparator;
 import org.wamblee.system.core.Scope;
 import org.wamblee.test.AssertionUtils;
 
diff --git a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java
index 522b14b8..b8ca2596 100644
--- a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java
+++ b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java
@@ -15,7 +15,6 @@
  */
 package org.wamblee.system.components;
 
-import org.wamblee.io.ClassPathResource;
 import org.wamblee.persistence.DerbyDatabase;
 import org.wamblee.system.container.Container;
 
diff --git a/system/general/src/test/java/org/wamblee/system/container/Application.java b/system/general/src/test/java/org/wamblee/system/container/Application.java
index 58dcba60..9392974f 100644
--- a/system/general/src/test/java/org/wamblee/system/container/Application.java
+++ b/system/general/src/test/java/org/wamblee/system/container/Application.java
@@ -15,10 +15,6 @@
  */
 package org.wamblee.system.container;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.wamblee.system.core.AbstractComponent;
 import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.ProvidedInterface;
diff --git a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
index 120548cb..a7589fe4 100644
--- a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
@@ -15,9 +15,6 @@
  */
 package org.wamblee.system.container;
 
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
index b6c1a95f..139de7d3 100644
--- a/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
@@ -15,9 +15,6 @@
  */
 package org.wamblee.system.core;
 
-import org.wamblee.system.core.DefaultRequiredInterface;
-import org.wamblee.system.core.RequiredInterface;
-
 import junit.framework.TestCase;
 
 public class DefaultRequiredInterfaceTest extends TestCase {
diff --git a/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
index 55cae896..c76ff97e 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
@@ -15,12 +15,10 @@
  */ 
 package org.wamblee.system.graph;
 
-import java.util.Arrays;
-
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 import junit.framework.TestCase;
 
-import static org.mockito.Mockito.*; 
-
 import org.wamblee.system.container.Application;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.Environment;
diff --git a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java
index 32879657..5f45f551 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java
@@ -17,17 +17,14 @@ package org.wamblee.system.graph.component;
 
 import junit.framework.TestCase;
 
-import org.wamblee.system.container.Application;
 import org.wamblee.system.container.Container;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultProvidedInterface;
-import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.Environment;
 import org.wamblee.system.graph.DefaultEdge;
 import org.wamblee.system.graph.DefaultNode;
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
-import org.wamblee.system.graph.Node;
 
 public class ConnectExternalProvidedProvidedEdgeFilterTest extends TestCase {
 
diff --git a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
index 4f30b538..7e8e02ce 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
@@ -15,19 +15,18 @@
  */
 package org.wamblee.system.graph.component;
 
+import junit.framework.TestCase;
+
 import org.wamblee.system.container.Application;
 import org.wamblee.system.container.Container;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultRequiredInterface;
-import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.system.graph.DefaultEdge;
 import org.wamblee.system.graph.DefaultNode;
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
 import org.wamblee.system.graph.Node;
 
-import junit.framework.TestCase;
-
 public class ConnectRequiredExternallyRequiredEdgeFilterTest extends TestCase {
 
     private Component<?> _comp;
-- 
2.31.1