From 383a22332d7df1481e090add1e25406a5a358fd9 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Tue, 13 May 2008 18:27:28 +0800
Subject: [PATCH] update for EOFM-83
---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexChainElement.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexChainElement.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexChainElement.java
index c4dec54..24ab7b6 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexChainElement.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexChainElement.java
@@ -146,7 +146,7 @@
public Geometry toGeometry(GeometryFactory factory)
{
- ArrayList list = new ArrayList();
+ ArrayList<Geometry> list = new ArrayList<Geometry>();
if (size() == 1)
{
@@ -154,17 +154,17 @@
if (element instanceof LineStringElement)
{
- if( ((LineStringElement) element).getVerticeSize() == 0 || ((LineStringElement) element).getVerticeSize() > 1)
- {
- return ((LineStringElement) element).toGeometry(factory);
- }
+ if (((LineStringElement) element).getVerticeSize() == 0 || ((LineStringElement) element).getVerticeSize() > 1)
+ {
+ return ((LineStringElement) element).toGeometry(factory);
+ }
} else if (element instanceof LineElement)
{
- if( ((LineElement) element).getVertices().length == 0 || ((LineElement) element).getVertices().length > 1)
- {
- return ((LineElement) element).toGeometry(factory);
- }
+ if (((LineElement) element).getVertices().length == 0 || ((LineElement) element).getVertices().length > 1)
+ {
+ return ((LineElement) element).toGeometry(factory);
+ }
} else
{
@@ -177,32 +177,33 @@
}
}
- for (ListIterator it = listIterator(); it.hasNext(); )
+ for (ListIterator it = listIterator(); it.hasNext();)
{
Element element = (Element) it.next();
if (element instanceof LineStringElement)
{
- if( ((LineStringElement) element).getVerticeSize() == 0 || ((LineStringElement) element).getVerticeSize() > 1)
- {
- list.add(((LineStringElement) element).toGeometry(factory));
- }
+ if (((LineStringElement) element).getVerticeSize() == 0 || ((LineStringElement) element).getVerticeSize() > 1)
+ {
+ list.add(((LineStringElement) element).toGeometry(factory));
+ }
} else if (element instanceof LineElement)
{
- if( ((LineElement) element).getVertices().length == 0 || ((LineElement) element).getVertices().length > 1)
- {
- list.add(((LineElement) element).toGeometry(factory));
- }
-
+ if (((LineElement) element).getVertices().length == 0 || ((LineElement) element).getVertices().length > 1)
+ {
+ list.add(((LineElement) element).toGeometry(factory));
+ }
+ } else if (element instanceof ArcElement)
+ {
+ list.add(((ArcElement) element).toGeometry(factory));
}
}
- Geometry[] ga = (Geometry[]) list.toArray(new Geometry[list.size()]);
- GeometryCollection geos = new GeometryCollection(ga, factory);
+ Geometry[] ga = list.toArray(new Geometry[list.size()]);
- return geos;
+ return new GeometryCollection(ga, factory);
}
public double getElementSize()
--
Gitblit v0.0.0-SNAPSHOT