(no commit message)

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 3dfda5cf041459e65dcb2d41c60d85eeedbb39b0..9669cb216dd65a28e0f75670e3f0a9d106b2efb0 100644 (file)
--- 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 2f9aee659d0aaae25db9ae037738ebc8643780f8..c790567300206015123a27ee8bcf721b34c693a2 100644 (file)
--- 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 ad4b09863418b6e7f02b47cfcdfec952f5e4b2db..50c6cc3b2ad6ebd682b0f57336963e019b34c1be 100644 (file)
--- 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 62b1604d5c7fb9d15ce7b749a62fb5b15eb8a2c2..1007ae70a0ea1f5ca0bb623f3705543b31457b69 100644 (file)
--- 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 f04b381f0abb3d0749d132d8a1d66cb4b0ec2b0b..a1d2481f60d324f9ba89664d250bb5b021896dbe 100644 (file)
--- 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 e08190e9ca8b72ae29e5aa337562ddfa84e282f0..5e4f868ffda5a255224e87a9cdcd7b000c8da4dd 100644 (file)
--- 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 522b14b823542138c0af368963a77d4e627c3d16..b8ca2596e4e4c034f985e6196cdcd9e5440562fa 100644 (file)
--- 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 58dcba6070348876b513792c2a08a7f850797e28..9392974f38275c9cf1baa269c81b7d481b0b888f 100644 (file)
--- 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 120548cb8b0063f30ab3e7c3a69e3a83b5d98ed5..a7589fe46250eff9561c11ec987e1a52071e0f56 100644 (file)
--- 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 b6c1a95ffea842e46ed8978fa07154f6e054e20d..139de7d372ced444d1657f69bd46390512c109ac 100644 (file)
--- 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 55cae8964983a8e12efd2be53a7910651772a700..c76ff97e954eb62e03874084adcf1291f96c3599 100644 (file)
--- 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 328796577a48d92f907506ab178e40879f8537d0..5f45f55123cdc588331e1a881b8e9346c90b4171 100644 (file)
--- 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 4f30b538d59c6bbf7f5ef28eef73eb05bf7787a9..7e8e02ce6914fbd541edc5c2378a150f479bab2f 100644 (file)
--- 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;