Revision 46040
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/aggregate/MultiLine2DM.java | ||
---|---|---|
172 | 172 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
173 | 173 |
} |
174 | 174 |
} else { |
175 |
result.addPrimitive((Primitive)primitive.offset(distance)); |
|
175 |
Primitive offsetPrimitive = (Primitive)primitive.offset(distance); |
|
176 |
if(offsetPrimitive != null){ |
|
177 |
result.addPrimitive(offsetPrimitive); |
|
178 |
} |
|
176 | 179 |
} |
177 | 180 |
} |
178 | 181 |
return result; |
... | ... | |
188 | 191 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
189 | 192 |
} |
190 | 193 |
} else { |
191 |
result.addPrimitive((Primitive)primitive.offset(joinStyle, distance)); |
|
194 |
Primitive offsetPrimitive = (Primitive)primitive.offset(joinStyle, distance); |
|
195 |
if(offsetPrimitive != null){ |
|
196 |
result.addPrimitive(offsetPrimitive); |
|
197 |
} |
|
192 | 198 |
} |
193 | 199 |
} |
194 | 200 |
return result; |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/aggregate/MultiLine3DM.java | ||
---|---|---|
25 | 25 |
import java.awt.Shape; |
26 | 26 |
import java.awt.geom.AffineTransform; |
27 | 27 |
import java.util.Iterator; |
28 |
|
|
29 | 28 |
import org.gvsig.fmap.geom.Geometry; |
30 | 29 |
import org.gvsig.fmap.geom.GeometryException; |
31 | 30 |
import org.gvsig.fmap.geom.aggregate.MultiLine; |
32 | 31 |
import org.gvsig.fmap.geom.aggregate.MultiPoint; |
33 | 32 |
import org.gvsig.fmap.geom.aggregate.MultiPolygon; |
34 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line2D; |
|
35 | 33 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line3DM; |
36 | 34 |
import org.gvsig.fmap.geom.operation.GeometryOperationException; |
37 | 35 |
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException; |
... | ... | |
175 | 173 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
176 | 174 |
} |
177 | 175 |
} else { |
178 |
result.addPrimitive((Primitive)primitive.offset(distance)); |
|
176 |
Primitive offsetPrimitive = (Primitive)primitive.offset(distance); |
|
177 |
if(offsetPrimitive != null){ |
|
178 |
result.addPrimitive(offsetPrimitive); |
|
179 |
} |
|
179 | 180 |
} |
180 | 181 |
} |
181 | 182 |
return result; |
... | ... | |
192 | 193 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
193 | 194 |
} |
194 | 195 |
} else { |
195 |
result.addPrimitive((Primitive)primitive.offset(joinStyle, distance)); |
|
196 |
Primitive offsetPrimitive = (Primitive)primitive.offset(joinStyle, distance); |
|
197 |
if(offsetPrimitive != null){ |
|
198 |
result.addPrimitive(offsetPrimitive); |
|
199 |
} |
|
196 | 200 |
} |
197 | 201 |
} |
198 | 202 |
return result; |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/aggregate/MultiLine2D.java | ||
---|---|---|
23 | 23 |
package org.gvsig.fmap.geom.jts.aggregate; |
24 | 24 |
|
25 | 25 |
import java.util.Iterator; |
26 |
|
|
27 | 26 |
import org.gvsig.fmap.geom.Geometry; |
28 | 27 |
import org.gvsig.fmap.geom.GeometryException; |
29 | 28 |
import org.gvsig.fmap.geom.aggregate.MultiLine; |
30 | 29 |
import org.gvsig.fmap.geom.aggregate.MultiPoint; |
31 | 30 |
import org.gvsig.fmap.geom.aggregate.MultiPolygon; |
32 |
import org.gvsig.fmap.geom.aggregate.MultiPrimitive; |
|
33 | 31 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line2D; |
34 | 32 |
import org.gvsig.fmap.geom.operation.GeometryOperationException; |
35 | 33 |
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException; |
... | ... | |
155 | 153 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
156 | 154 |
} |
157 | 155 |
} else { |
158 |
result.addPrimitive((Primitive)primitive.offset(distance)); |
|
156 |
Primitive offsetPrimitive = (Primitive)primitive.offset(distance); |
|
157 |
if(offsetPrimitive != null){ |
|
158 |
result.addPrimitive(offsetPrimitive); |
|
159 |
} |
|
159 | 160 |
} |
160 | 161 |
} |
161 | 162 |
return result; |
... | ... | |
171 | 172 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
172 | 173 |
} |
173 | 174 |
} else { |
174 |
result.addPrimitive((Primitive)primitive.offset(joinStyle, distance)); |
|
175 |
Primitive offsetPrimitive = (Primitive)primitive.offset(joinStyle, distance); |
|
176 |
if(offsetPrimitive != null){ |
|
177 |
result.addPrimitive(offsetPrimitive); |
|
178 |
} |
|
175 | 179 |
} |
176 | 180 |
} |
177 | 181 |
return result; |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/aggregate/MultiLine3D.java | ||
---|---|---|
25 | 25 |
import java.awt.Shape; |
26 | 26 |
import java.awt.geom.AffineTransform; |
27 | 27 |
import java.util.Iterator; |
28 |
|
|
29 | 28 |
import org.gvsig.fmap.geom.Geometry; |
30 | 29 |
import org.gvsig.fmap.geom.GeometryException; |
31 | 30 |
import org.gvsig.fmap.geom.aggregate.MultiLine; |
32 | 31 |
import org.gvsig.fmap.geom.aggregate.MultiPoint; |
33 | 32 |
import org.gvsig.fmap.geom.aggregate.MultiPolygon; |
34 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line2D; |
|
35 | 33 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line3D; |
36 | 34 |
import org.gvsig.fmap.geom.operation.GeometryOperationException; |
37 | 35 |
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException; |
... | ... | |
176 | 174 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
177 | 175 |
} |
178 | 176 |
} else { |
179 |
result.addPrimitive((Primitive)primitive.offset(distance)); |
|
177 |
Primitive offsetPrimitive = (Primitive)primitive.offset(distance); |
|
178 |
if(offsetPrimitive != null){ |
|
179 |
result.addPrimitive(offsetPrimitive); |
|
180 |
} |
|
180 | 181 |
} |
181 | 182 |
} |
182 | 183 |
return result; |
... | ... | |
193 | 194 |
result.addPrimitive(multiOffset.getPrimitiveAt(i)); |
194 | 195 |
} |
195 | 196 |
} else { |
196 |
result.addPrimitive((Primitive)primitive.offset(joinStyle, distance)); |
|
197 |
Primitive offsetPrimitive = (Primitive)primitive.offset(joinStyle, distance); |
|
198 |
if(offsetPrimitive != null){ |
|
199 |
result.addPrimitive(offsetPrimitive); |
|
200 |
} |
|
197 | 201 |
} |
198 | 202 |
} |
199 | 203 |
return result; |
Also available in: Unified diff