(no commit message)

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaces.java
deleted file mode 100644 (file)
index 9fd8c06..0000000
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaces.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */ 
-package org.wamblee.system.core;
-
-import java.util.List;
-
-/**
- * Read-only access to the provided interfaces of a component. 
- * 
- * @author Erik Brakkee. 
- *
- */
-public class ProvidedInterfaces extends ReadOnlyNamedInterfaces<ProvidedInterface> {
-    
-    /**
-     * Constructs the provided interfaces. 
-     * @param aInterfaces List of interfaces. 
-     */
-    public ProvidedInterfaces(List<ProvidedInterface> aInterfaces) { 
-        super(ProvidedInterface.class, aInterfaces);
-    }
-}

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadOnlyNamedInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadOnlyNamedInterfaces.java
deleted file mode 100644 (file)
index 4248b1d..0000000
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadOnlyNamedInterfaces.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2008 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */ 
-package org.wamblee.system.core;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A set of interfaces that cannot be changed with useful added functionality. 
- * 
- * @author Erik Brakkee
- *
- * @param <T>
- */
-public class ReadOnlyNamedInterfaces<T extends NamedInterface> implements Iterable<T> {
-
-    private Class<T> _type; 
-    private List<T> _interfaces; 
-
-    public ReadOnlyNamedInterfaces(Class<T> aType, List<T> aInterfaces) {
-        _type = aType; 
-        _interfaces = Collections.unmodifiableList(aInterfaces); 
-    }
-    
-    /**
-     * @return Number of interfaces. 
-     */
-    public int size() { 
-        return _interfaces.size();
-    }
- 
-    /**
-     * Gets the interface at a given index. 
-     * @param aIndex Index of the interface to return. 
-     * @return Interface.
-     */
-    public T get(int aIndex) { 
-        return _interfaces.get(aIndex);
-    }
-    
-    /**
-     * Gets the interface with a specific name. 
-     * @param aName Interface name. 
-     * @return Interface. 
-     */
-    public T get(String aName) { 
-        for (T intf: _interfaces) { 
-            if ( intf.getName().equals(aName)) { 
-                return intf; 
-            }
-        }
-        return null; 
-    }
-    
-    @Override
-    public Iterator<T> iterator() {
-        return _interfaces.iterator();
-    }
-    
-    /**
-     * Converts the interfaces to an array. 
-     * @return List of interfaces in an array. 
-     */
-    public T[] toArray() { 
-        T[] storage = (T[])Array.newInstance(_type, _interfaces.size());
-        return _interfaces.toArray(storage);
-    }
-}

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/RequiredInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/RequiredInterfaces.java
deleted file mode 100644 (file)
index bd747cd..0000000
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/RequiredInterfaces.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2008 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */ 
-package org.wamblee.system.core;
-
-import java.util.List;
-
-/**
- * Read-only access to required interfaces of a component. 
- * @author Erik Brakkee
- *
- */
-public class RequiredInterfaces extends ReadOnlyNamedInterfaces<RequiredInterface> {
-
-    public RequiredInterfaces(List<RequiredInterface> aInterfaces) { 
-        super(RequiredInterface.class, aInterfaces);
-    }
-    
-}

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
index 8cd119f37e7cbe598bb27c10de80f7e5d0e03a10..7aed9f6b98c3469f4e2368fcf9ec132c8750bddd 100644 (file)
--- a/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
+++ b/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
@@ -31,9 +31,7 @@ import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.DefaultScope;
 import org.wamblee.system.core.Environment;
 import org.wamblee.system.core.ProvidedInterface;
-import org.wamblee.system.core.ProvidedInterfaces;
 import org.wamblee.system.core.RequiredInterface;
-import org.wamblee.system.core.RequiredInterfaces;
 import org.wamblee.system.core.Scope;
 import org.wamblee.system.core.StringComponent;
 import org.wamblee.system.core.SystemAssemblyException;

diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java b/trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
index 2a34920883014c6b1e0de77b2885820bb693f5e1..71ac30857c59c3181cc69cd2cb2c144b27dfe154 100644 (file)
--- a/trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
+++ b/trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
@@ -18,9 +18,7 @@ package org.wamblee.system.spring;
 import java.util.List;
 
 import org.springframework.beans.factory.FactoryBean;
-import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
-import org.wamblee.system.core.RequiredInterfaces;
 import org.wamblee.system.core.SystemAssemblyException;
 
 /**