From 986c4d0c260012170ae425fd83b74b23451efac4 Mon Sep 17 00:00:00 2001
From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Thu, 5 Jun 2008 21:01:56 +0000
Subject: [PATCH]
---
.../system/core/ReadWriteNamedInterfaces.java | 31 +++----------------
.../core/ReadWriteProvidedInterfaces.java | 2 +-
.../core/ReadWriteRequiredInterfaces.java | 2 +-
3 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteNamedInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteNamedInterfaces.java
index 0dcd4187..ea7d4903 100644
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteNamedInterfaces.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteNamedInterfaces.java
@@ -20,43 +20,22 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-public class ReadWriteNamedInterfaces<T extends NamedInterface> implements Iterable<T> {
-
- protected List<T> _interfaces;
+public class ReadWriteNamedInterfaces<T extends NamedInterface> extends ArrayList<T> {
public ReadWriteNamedInterfaces() {
- _interfaces = new ArrayList<T>();
+ // Empty.
}
public ReadWriteNamedInterfaces(T[] aInterfaces) {
- _interfaces = new ArrayList<T>();
- _interfaces.addAll(Arrays.asList(aInterfaces));
- }
-
- public int size() {
- return _interfaces.size();
+ addAll(Arrays.asList(aInterfaces));
}
-
- public T get(int aIndex) {
- return _interfaces.get(aIndex);
- }
-
+
public T get(String aName) {
- for (T intf: _interfaces) {
+ for (T intf: this) {
if ( intf.getName().equals(aName)) {
return intf;
}
}
return null;
}
-
- public void add(T aInterface) {
- _interfaces.add(aInterface);
- }
-
- @Override
- public Iterator<T> iterator() {
- return _interfaces.iterator();
- }
-
}
diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteProvidedInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteProvidedInterfaces.java
index 8581c939..3c5c1590 100644
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteProvidedInterfaces.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteProvidedInterfaces.java
@@ -26,6 +26,6 @@ public class ReadWriteProvidedInterfaces extends ReadWriteNamedInterfaces<Provid
}
public ProvidedInterfaces readOnlyView() {
- return new ProvidedInterfaces(_interfaces);
+ return new ProvidedInterfaces(this);
}
}
diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteRequiredInterfaces.java b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteRequiredInterfaces.java
index 3cdccebb..033afa86 100644
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteRequiredInterfaces.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/core/ReadWriteRequiredInterfaces.java
@@ -26,6 +26,6 @@ public class ReadWriteRequiredInterfaces extends ReadWriteNamedInterfaces<Requir
}
public RequiredInterfaces readOnlyView() {
- return new RequiredInterfaces(_interfaces);
+ return new RequiredInterfaces(this);
}
}
--
2.31.1