From: erik Date: Fri, 6 Jun 2008 18:49:12 +0000 (+0000) Subject: (no commit message) X-Git-Tag: wamblee-utils-0.2@603~81 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=5197773472d4b90864f3ba94d6dce3a27b70ce0f;p=utils --- 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 index 9fd8c06f..00000000 --- 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 { - - /** - * Constructs the provided interfaces. - * @param aInterfaces List of interfaces. - */ - public ProvidedInterfaces(List 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 index 4248b1db..00000000 --- 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 - */ -public class ReadOnlyNamedInterfaces implements Iterable { - - private Class _type; - private List _interfaces; - - public ReadOnlyNamedInterfaces(Class aType, List 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 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 index bd747cd6..00000000 --- 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 { - - public RequiredInterfaces(List 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 8cd119f3..7aed9f6b 100644 --- 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 2a349208..71ac3085 100644 --- 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; /**