Revision 298 trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.ogr.mainplugin/src/main/java/org/gvsig/gdal/app/ogr/mainplugin/gui/JOGRDataExplorerController.java

View differences:

JOGRDataExplorerController.java
41 41

  
42 42
import org.apache.commons.lang.StringUtils;
43 43
import org.apache.commons.lang3.ArrayUtils;
44
import org.gvsig.filedialogchooser.FileDialogChooser;
45
import org.gvsig.filedialogchooser.FileDialogChooserManager;
44 46

  
45 47
import org.gvsig.fmap.IconThemeHelper;
46 48
import org.gvsig.fmap.dal.DALLocator;
......
51 53
import org.gvsig.fmap.dal.exception.InitializeException;
52 54
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
53 55
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
56
import static org.gvsig.fmap.dal.serverexplorer.filesystem.swing.FilesystemExplorerWizardPanelController.OPEN_LAYER_FILE_CHOOSER_ID;
54 57
import org.gvsig.fmap.mapcontrol.swing.dynobject.DynObjectEditor;
55 58
import org.gvsig.gdal.prov.ogr.OGRDataExplorer;
56 59
import org.gvsig.gdal.prov.ogr.OGRDataExplorerParameters;
......
59 62
import org.gvsig.gdal.prov.ogr.OGRDataStoreProviderFactory;
60 63
import org.gvsig.tools.ToolsLocator;
61 64
import org.gvsig.tools.dynobject.DynObject;
65
import org.gvsig.tools.folders.FoldersManager;
62 66
import org.gvsig.tools.i18n.I18nManager;
63 67
import org.gvsig.tools.service.ServiceException;
68
import org.gvsig.tools.util.ToolsUtilLocator;
69
import org.gvsig.tools.util.ToolsUtilManager;
64 70

  
65 71
import org.slf4j.Logger;
66 72
import org.slf4j.LoggerFactory;
......
333 339

  
334 340
            @Override
335 341
            public void actionPerformed(ActionEvent e) {
336

  
337
                JFileChooser chooser = null;
338

  
342
                FoldersManager foldersManager = ToolsLocator.getFoldersManager();
343
                FileDialogChooserManager fileDialogChooserManager = ToolsUtilLocator.getFileDialogChooserManager();
344
                
345
                FileDialogChooser chooser = fileDialogChooserManager.create(OPEN_LAYER_FILE_CHOOSER_ID);
346
                chooser.setCurrentDirectory(foldersManager.get("DataFolder"));
339 347
                if (StringUtils.isNotBlank(getConnectionString())) {
340 348
                    File file = new File(getConnectionString());
341 349
                    if (file.exists()) {
342
                        chooser = new JFileChooser(file.getParentFile());
350
                        chooser.setCurrentDirectory(file.getParentFile());
343 351
                    }
344 352
                }
345 353

  
346
                if (chooser == null) {
347
                    Preferences prefs = Preferences.userRoot().node( "gvsig.foldering" );
348
                    String dataFolder = prefs.get("DataFolder", null);
349

  
350
                    if(dataFolder!=null && !dataFolder.isEmpty()){
351
                        chooser = new JFileChooser(dataFolder);
352
                    } else {
353
                        chooser = new JFileChooser();
354
                    }
355
                }
356

  
357 354
                int reply = chooser.showOpenDialog(asJComponent());
358 355

  
359 356
                if (reply == JFileChooser.APPROVE_OPTION) {

Also available in: Unified diff