Revision 17845 trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/gridmath/gui/listener/GridMathPanelListener.java

View differences:

GridMathPanelListener.java
56 56
import org.gvsig.raster.dataset.GeoRasterWriter;
57 57
import org.gvsig.raster.dataset.InvalidSetViewException;
58 58
import org.gvsig.raster.dataset.io.RasterDriverException;
59
import org.gvsig.raster.util.ExtendedFileFilter;
59 60
import org.gvsig.raster.util.RasterToolsUtil;
61
import org.gvsig.rastertools.RasterModule;
60 62
import org.gvsig.remotesensing.gridmath.ErrorSintaxisException;
61 63
import org.gvsig.remotesensing.gridmath.GridMathProcess;
62 64
import org.gvsig.remotesensing.gridmath.NoAssignedVarsException;
......
269 271
	}
270 272
	
271 273
	/**
272
	 * @return string con el path del fichero de salida
274
	 * Devuelve la ruta del fichero donde se va a guardar, en caso de guardarse
275
	 * en memoria, calcula el nombre sin preguntar y devuelve la ruta.
276
	 * @return string con la ruta de salida
273 277
	 */
274 278
	public String getFileSelected() {
275 279
		String path = "";
276 280
		if (gridMathPanel.getOptionsPanel().getRadioFile().isSelected()) {
277 281
			JFileChooser chooser = new JFileChooser(FileOpenWizard.getLastPath());
278 282
			chooser.setDialogTitle(PluginServices.getText(this, "seleccionar_fichero"));
279

  
280 283
			//A?adimos las extensiones que hayan sido registradas en el driver
281 284
			String[] extList = GeoRasterWriter.getDriversExtensions();
282 285
			for(int i=0;i<extList.length;i++)
283
				chooser.addChoosableFileFilter(new WriterFilter(extList[i]));
286
				chooser.addChoosableFileFilter(new ExtendedFileFilter(extList[i]));
284 287

  
285
			if (chooser.showOpenDialog(gridMathPanel) != JFileChooser.APPROVE_OPTION)
288
			if (chooser.showOpenDialog(gridMathPanel.getOptionsPanel()) != JFileChooser.APPROVE_OPTION)
286 289
				return null;
287 290

  
288
			String fName = chooser.getSelectedFile().toString();
289
			String ext = ((WriterFilter)chooser.getFileFilter()).getDescription();
290

  
291
			ext = ext.toLowerCase().substring(ext.lastIndexOf(".") + 1, ext.length());
292

  
293
			if ((fName != null) && !fName.equals(""))
294
				if (!fName.endsWith("." + ext))
295
					fName = fName + "." + ext;
296

  
297 291
			FileOpenWizard.setLastPath(chooser.getSelectedFile().getPath().substring(0, chooser.getSelectedFile().getPath().lastIndexOf(File.separator)));
298
			path = fName;
292
			ExtendedFileFilter fileFilter = (ExtendedFileFilter) chooser.getFileFilter();
293
			path = fileFilter.getNormalizedFilename(chooser.getSelectedFile());
299 294
		} else {
295
			String file = gridMathPanel.getOptionsPanel().getJTextNombreCapa().getText();
300 296
			path = Utilities.createTempDirectory() + File.separator + gridMathPanel.getOptionsPanel().getJTextNombreCapa().getText() + ".tif";
301
			gridMathPanel.getOptionsPanel().setNewLayerText();
297
			if(file.compareTo(RasterModule.getOnlyLayerName()) == 0) 
298
				RasterModule.usesOnlyLayerName();
299
			gridMathPanel.getOptionsPanel().updateNewLayerText();
302 300
		}
301
		
303 302
		return path;
304 303
	}
304
	
305 305
}
306 306

  
307 307
/**

Also available in: Unified diff