From 94e0f911454190575358dca175fb9c3dd878fa49 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 25 Aug 2008 01:26:16 +0800
Subject: [PATCH] update for EOFM-152
---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexShapeElement.java | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexShapeElement.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexShapeElement.java
index f34dc57..a4389e4 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexShapeElement.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexShapeElement.java
@@ -57,9 +57,14 @@
return list.toArray();
}
- public boolean add(Object o)
+ public <T> T[] toArray(T[] ts)
{
- return list.add((Element) o);
+ return list.toArray(ts);
+ }
+
+ public boolean add(Element element)
+ {
+ return list.add(element);
}
public boolean remove(Object o)
@@ -67,14 +72,29 @@
return list.remove(o);
}
- public boolean addAll(Collection c)
+ public boolean containsAll(Collection<?> objects)
{
- return list.addAll(c);
+ return list.containsAll(objects);
}
- public boolean addAll(int index, Collection c)
+ public boolean addAll(Collection<? extends Element> elements)
{
- return list.addAll(index, c);
+ return list.addAll(elements);
+ }
+
+ public boolean addAll(int i, Collection<? extends Element> elements)
+ {
+ return list.addAll(i, elements);
+ }
+
+ public boolean removeAll(Collection<?> objects)
+ {
+ return list.removeAll(objects);
+ }
+
+ public boolean retainAll(Collection<?> objects)
+ {
+ return list.retainAll(objects);
}
public void clear()
@@ -82,22 +102,22 @@
list.clear();
}
- public Object get(int index)
+ public Element get(int index)
{
return list.get(index);
}
- public Object set(int index, Object element)
+ public Element set(int i, Element element)
{
- return list.set(index, (Element) element);
+ return list.set(i, element);
}
- public void add(int index, Object element)
+ public void add(int i, Element element)
{
- list.add(index, (Element) element);
+ list.add(i, element);
}
- public Object remove(int index)
+ public Element remove(int index)
{
return list.remove(index);
}
@@ -125,26 +145,6 @@
public List subList(int fromIndex, int toIndex)
{
return list.subList(fromIndex, toIndex);
- }
-
- public boolean retainAll(Collection c)
- {
- return list.retainAll(c);
- }
-
- public boolean removeAll(Collection c)
- {
- return list.removeAll(c);
- }
-
- public boolean containsAll(Collection c)
- {
- return list.containsAll(c);
- }
-
- public Object[] toArray(Object[] a)
- {
- return list.toArray(a);
}
public Geometry toGeometry(GeometryFactory factory)
--
Gitblit v0.0.0-SNAPSHOT