Revision 1259 org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/AbstractSextanteGeoProcess.java
| AbstractSextanteGeoProcess.java | ||
|---|---|---|
| 66 | 66 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
| 67 | 67 |
import org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory; |
| 68 | 68 |
import org.gvsig.tools.evaluator.Evaluator; |
| 69 |
import org.gvsig.tools.namestranslator.NamesTranslator; |
|
| 69 | 70 |
|
| 70 | 71 |
/** |
| 71 | 72 |
* Base implementation for Sextante based {@link GeoProcess} objects.
|
| ... | ... | |
| 217 | 218 |
*/ |
| 218 | 219 |
protected FeatureStore buildOutPutStoreFromUnion(FeatureType featureType1, |
| 219 | 220 |
FeatureType featureType2, int shapeType, String sextanteLayerName, |
| 220 |
String sextanteLayerLabel) {
|
|
| 221 |
String sextanteLayerLabel, NamesTranslator nameTranslator) {
|
|
| 221 | 222 |
return buildOutPutStoreFromUnion(featureType1, featureType2, shapeType, |
| 222 |
sextanteLayerName, sextanteLayerLabel, null, null); |
|
| 223 |
sextanteLayerName, sextanteLayerLabel, null, null, nameTranslator);
|
|
| 223 | 224 |
} |
| 224 | 225 |
|
| 225 | 226 |
/** |
| ... | ... | |
| 230 | 231 |
*/ |
| 231 | 232 |
protected FeatureStore buildOutPutStoreFromUnion(FeatureType featureType1, |
| 232 | 233 |
FeatureType featureType2, int shapeType, String sextanteLayerName, |
| 233 |
String sextanteLayerLabel, String newField, Class<?> newFieldType) {
|
|
| 234 |
String sextanteLayerLabel, String newField, Class<?> newFieldType, NamesTranslator nameTranslator) {
|
|
| 235 |
|
|
| 236 |
nameTranslator.clear(); |
|
| 237 |
|
|
| 234 | 238 |
int sizeAux = 0; |
| 235 | 239 |
if (newField != null && newFieldType != null) |
| 236 | 240 |
sizeAux = 1; |
| ... | ... | |
| 259 | 263 |
(FeatureAttributeDescriptor) it.next(); |
| 260 | 264 |
if(attribute.getDataType().getType() != DataTypes.GEOMETRY) {
|
| 261 | 265 |
attrNames[i] = attribute.getName(); |
| 266 |
nameTranslator.addSource(attribute.getName()); |
|
| 262 | 267 |
types[i] = attribute.getObjectClass(); |
| 263 | 268 |
i++; |
| 264 | 269 |
} |
| ... | ... | |
| 272 | 277 |
String attrName = |
| 273 | 278 |
checkAttrName(attribute.getName(), featureType1.size() - 1); |
| 274 | 279 |
attrNames[i] = attrName; |
| 280 |
nameTranslator.addSource(attribute.getName()); |
|
| 275 | 281 |
types[i] = attribute.getObjectClass(); |
| 276 | 282 |
i++; |
| 277 | 283 |
} |
| ... | ... | |
| 279 | 285 |
|
| 280 | 286 |
if (newField != null && newFieldType != null) {
|
| 281 | 287 |
attrNames[attrNames.length - 1] = newField; |
| 288 |
nameTranslator.addSource(newField); |
|
| 282 | 289 |
types[types.length - 1] = newFieldType; |
| 283 | 290 |
} |
| 284 | 291 |
|
| 285 | 292 |
try {
|
| 286 | 293 |
IVectorLayer output = |
| 287 | 294 |
getNewVectorLayer(sextanteLayerLabel, sextanteLayerName, |
| 288 |
shapeType, types, attrNames);
|
|
| 295 |
shapeType, types, nameTranslator.getTranslatedNamesAsArray());
|
|
| 289 | 296 |
if (output != null) {
|
| 290 | 297 |
return ((FlyrVectIVectorLayer) output).getFeatureStore(); |
| 291 | 298 |
} |
Also available in: Unified diff