Revision 40490 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.shape/src/main/java/org/gvsig/exportto/swing/prov/shape/ExporttoShapeService.java

View differences:

ExporttoShapeService.java
50 50
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
51 51
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorer;
52 52
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorerParameters;
53
import org.gvsig.fmap.dal.store.shp.SHPStoreParameters;
53 54
import org.gvsig.fmap.geom.Geometry;
54 55
import org.gvsig.fmap.geom.GeometryLocator;
55 56
import org.gvsig.fmap.geom.GeometryManager;
......
128 129
                throw_exp = ee;
129 130
            }
130 131
            
131
            finishAction(layer_name + " (point)", newFeatureStoreParameters);
132
            finishAction(layer_name + " (point)", item_shp, projection);
132 133

  
133 134
            // CURVE
134 135
            fileName = withoutShp + "_curve" + ".shp";
......
144 145
                throw_exp = ee;
145 146
            }
146 147
            
147
            finishAction(layer_name + " (curve)", newFeatureStoreParameters);
148
            finishAction(layer_name + " (curve)", item_shp, projection);
148 149

  
149 150
            // SURFACE
150 151
            fileName = withoutShp + "_surface" + ".shp";
......
159 160
            } catch (ExporttoServiceException ee) {
160 161
                throw_exp = ee;
161 162
            }
162
            finishAction(layer_name + " (surface)", newFeatureStoreParameters);
163
            finishAction(layer_name + " (surface)", item_shp, projection);
163 164

  
164 165
        } else {
165 166
            
......
171 172
            } catch (ExporttoServiceException ee) {
172 173
                throw_exp = ee;
173 174
            }
174
            finishAction(layer_name, newFeatureStoreParameters);
175
            finishAction(layer_name, single_file, projection);
175 176
        }
176 177
        this.taskStatus.terminate();
177 178
        this.taskStatus.remove();
......
496 497
        return resp;
497 498
    }
498 499

  
499
    private void finishAction(String layerName,
500
        NewFeatureStoreParameters newFeatureStoreParameters) {
500
    private void finishAction(String layerName, File shp_file, IProjection proj)
501
    throws ExporttoServiceException {
502
        
503
        
504
        
505
        
506
        
501 507
        if (exporttoServiceFinishAction != null) {
502
            exporttoServiceFinishAction.finished(layerName,
503
                newFeatureStoreParameters);
508
            
509
            /*
510
             * Export is done. We notify with a SHPStoreParameters,
511
             * not with the NewSHPParameters we have used:
512
             */
513
            
514
            
515
            SHPStoreParameters shp_params = new SHPStoreParameters();
516
            
517
            
518
            shp_params.setSHPFile(shp_file);
519
            shp_params.setCRS(proj);
520
            shp_params.fixParameters();
521
            try {
522
                shp_params.validate();
523
            } catch (ValidateDataParametersException e) {
524
                throw new ExporttoServiceException(e);
525
            }
526
            exporttoServiceFinishAction.finished(layerName, shp_params);
504 527
        }
505 528
    }
506 529

  

Also available in: Unified diff