Revision 44573 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/export/shape/service/ExportShapeService.java

View differences:

ExportShapeService.java
64 64
    public static final int MAX_FIELD_NAME_LENGTH = 10;
65 65

  
66 66
    private final List<OpenDataStoreParameters> targetOpenStoreParameters;
67
    
68
    public File targetFile = null;
69 67

  
70 68
    public ExportShapeService(ExportServiceFactory factory, ExportShapeParameters parameters) {
71 69
        super(factory, parameters);
......
90 88
        } catch (Exception e) {
91 89
            throw new ExportException(e);
92 90
        }
93
        File parametersFile = this.getTargetFile();
91
        File parametersFile = getParameters().getEvaluatedFile();
94 92
        explorerParams.setRoot(parametersFile.getParent());
95 93

  
96 94
        FilesystemServerExplorer explorer;
......
108 106
    protected NewDataStoreParameters createTargetNewStoreParameters() throws ExportException {
109 107
        try {
110 108
            FilesystemServerExplorer explorer = (FilesystemServerExplorer) this.createServerExplorer();
111
            ;
112 109
            NewFeatureStoreParameters newStoreParameters = (NewFeatureStoreParameters) explorer.getAddParameters(
113
                    this.getTargetFile());
110
                    this.getParameters().getEvaluatedFile());
114 111
            newStoreParameters.setDynValue("Encoding", this.getParameters().getEncoding());
115 112
            newStoreParameters.setDynValue("CRS", this.getParameters().getTargetProjection());
116 113
            FeatureType ft;
......
128 125
        }
129 126
    }
130 127

  
131
    public File getTargetFile() {
132
        if (this.targetFile == null) {
133
            this.targetFile = ExpressionUtils.evaluateFilename(this.getParameters().getFile());
134
            this.targetFile = new File(FilenameUtils.removeExtension(this.targetFile.getAbsolutePath()) + ".shp");
135
            return this.targetFile;
136
        }
137
        return this.targetFile;
138
    }
139

  
140 128
    @Override
141 129
    public List<OpenDataStoreParameters> getTargetOpenStoreParameters() throws ExportException {
142 130
        return this.targetOpenStoreParameters;
......
147 135
        try {
148 136
            DataManager dataManager = DALLocator.getDataManager();
149 137
            OpenFeatureStoreParameters openStoreParameters = (OpenFeatureStoreParameters) dataManager.createStoreParameters("Shape");
150
            ((HasAFile) openStoreParameters).setFile(this.getTargetFile());
138
            ((HasAFile) openStoreParameters).setFile(getParameters().getEvaluatedFile());
151 139
            openStoreParameters.setDynValue("Encoding", getParameters().getEncoding());
152 140
            openStoreParameters.setDynValue("CRS", this.getParameters().getTargetProjection());
153 141
            return openStoreParameters;
......
158 146

  
159 147
    @Override
160 148
    public void export(FeatureSet featureSet) throws ExportException {
161
        this.targetFile = null;
162 149
        File parametersFile = ExpressionUtils.evaluateFilename(this.getParameters().getFile());
163 150
        String pathName = FilenameUtils.removeExtension(parametersFile.getAbsolutePath());
164 151

  

Also available in: Unified diff