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/TextNodeElement.java | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
index 4061dde..f82e526 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
@@ -28,7 +28,7 @@
{
private static final Logger logger = Logger.getLogger(TextElement.class);
- private ArrayList list = new ArrayList();
+ private ArrayList<Element> list = new ArrayList<Element>();
public TextNodeElement(byte[] raw)
{
@@ -50,7 +50,7 @@
return list.contains(o);
}
- public Iterator iterator()
+ public Iterator<Element> iterator()
{
return list.iterator();
}
@@ -60,9 +60,14 @@
return list.toArray();
}
- public boolean add(Object o)
+ public <T> T[] toArray(T[] ts)
{
- return list.add(o);
+ return list.toArray(ts);
+ }
+
+ public boolean add(Element element)
+ {
+ return list.add(element);
}
public boolean remove(Object o)
@@ -70,14 +75,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()
@@ -85,22 +105,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 index, Element element)
{
return list.set(index, element);
}
- public void add(int index, Object element)
+ public void add(int index, Element element)
{
list.add(index, element);
}
- public Object remove(int index)
+ public Element remove(int index)
{
return list.remove(index);
}
@@ -115,44 +135,29 @@
return list.lastIndexOf(o);
}
- public ListIterator listIterator()
+ public ListIterator<Element> listIterator()
{
return list.listIterator();
}
- public ListIterator listIterator(int index)
+ public ListIterator<Element> listIterator(int index)
{
return list.listIterator(index);
}
- public List subList(int fromIndex, int toIndex)
+ public List<Element> 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)
+ public Element[] toArray(Element[] a)
{
return list.toArray(a);
}
public String[] getTextArray()
{
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
for (ListIterator it = listIterator(); it.hasNext();)
{
@@ -164,7 +169,7 @@
}
}
- return (String[]) list.toArray(new String[list.size()]);
+ return list.toArray(new String[list.size()]);
}
public Geometry toGeometry(GeometryFactory factory)
@@ -366,7 +371,7 @@
for (Object o : this)
{
TextElement textElm = (TextElement) o;
- other.add(textElm.clone());
+ other.add((Element) textElm.clone());
}
return other;
--
Gitblit v0.0.0-SNAPSHOT