Revision 34661
| branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/fmap/dal/serverexplorer/filesystem/swing/FilesystemExplorerWizardPanel.java | ||
|---|---|---|
| 101 | 101 |
|
| 102 | 102 |
private static String lastPath = null; |
| 103 | 103 |
private static MyFileFilter lastFilter = null; |
| 104 |
private static final String DEFAULT_FILTER = "All supporteds"; |
|
| 104 | 105 |
|
| 105 | 106 |
private JList fileList; |
| 106 | 107 |
private JScrollPane fileListScroll; |
| ... | ... | |
| 171 | 172 |
while (iter.hasNext()) {
|
| 172 | 173 |
this.filters.add(new MyFileFilter(iter.next())); |
| 173 | 174 |
} |
| 174 |
this.filters.add(new MyFileFilter(explorer.getFilter(mode,"All supporteds")));
|
|
| 175 |
this.filters.add(new MyFileFilter(explorer.getFilter(mode, DEFAULT_FILTER)));
|
|
| 175 | 176 |
initUI(); |
| 176 | 177 |
} |
| 177 | 178 |
|
| ... | ... | |
| 545 | 546 |
public String getDescription() {
|
| 546 | 547 |
return filter.getDescription(); |
| 547 | 548 |
} |
| 549 |
|
|
| 550 |
public String getName() {
|
|
| 551 |
return filter.getDataStoreProviderName(); |
|
| 552 |
} |
|
| 548 | 553 |
} |
| 549 | 554 |
|
| 550 | 555 |
private List<FilesystemStoreParameters> addFiles() {
|
| ... | ... | |
| 581 | 586 |
PrepareContext context = this.getPrepareDataStoreContext(); |
| 582 | 587 |
for (File aFile : fileChooser.getSelectedFiles()) {
|
| 583 | 588 |
try {
|
| 584 |
param = explorer.createStoreParameters(aFile); |
|
| 589 |
param = explorer.createStoreParameters(aFile, |
|
| 590 |
lastFilter.getDescription().compareTo(DEFAULT_FILTER) == 0 ? null : lastFilter.getName()); |
|
| 585 | 591 |
if (param == null) {
|
| 586 | 592 |
// TODO show warning |
| 587 | 593 |
continue; |
| branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/serverexplorer/filesystem/impl/DefaultFilesystemServerExplorer.java | ||
|---|---|---|
| 32 | 32 |
import org.gvsig.tools.exception.BaseException; |
| 33 | 33 |
import org.gvsig.tools.extensionpoint.ExtensionPoint.Extension; |
| 34 | 34 |
|
| 35 |
@SuppressWarnings({"rawtypes","unchecked"})
|
|
| 35 |
@SuppressWarnings({"unchecked"})
|
|
| 36 | 36 |
public class DefaultFilesystemServerExplorer extends AbstractDisposable |
| 37 | 37 |
implements FilesystemServerExplorerProviderServices, |
| 38 | 38 |
FilesystemFileFilter {
|
| ... | ... | |
| 248 | 248 |
private DataManagerProviderServices getManager() {
|
| 249 | 249 |
return (DataManagerProviderServices) DALLocator.getDataManager(); |
| 250 | 250 |
} |
| 251 |
|
|
| 252 |
public DataStoreParameters createStoreParameters(File file, String providerName) throws DataException {
|
|
| 251 | 253 |
|
| 254 |
return this.getParametersFor(file, providerName, true); |
|
| 255 |
} |
|
| 256 |
|
|
| 252 | 257 |
public DataStoreParameters createStoreParameters(File file) throws DataException {
|
| 253 | 258 |
|
| 254 |
return this.getParametersFor(file, true); |
|
| 259 |
return this.getParametersFor(file, null, true);
|
|
| 255 | 260 |
} |
| 256 |
|
|
| 257 |
public DataStoreParameters getParametersFor(File file, boolean checksExist) |
|
| 258 |
throws DataException {
|
|
| 259 |
|
|
| 261 |
|
|
| 262 |
public DataStoreParameters getParametersFor(File file, String providerName, boolean checksExist) throws DataException {
|
|
| 263 |
|
|
| 260 | 264 |
if (checksExist) {
|
| 261 | 265 |
if (!file.exists()) {
|
| 262 | 266 |
return null; |
| ... | ... | |
| 271 | 275 |
return null; |
| 272 | 276 |
} |
| 273 | 277 |
} |
| 274 |
String providerName = this.getProviderName(file); |
|
| 278 |
if(providerName == null) |
|
| 279 |
providerName = this.getProviderName(file); |
|
| 275 | 280 |
if (providerName != null) {
|
| 276 | 281 |
DataStoreParameters params = this.getManager() |
| 277 |
.createStoreParameters(providerName);
|
|
| 282 |
.createStoreParameters(providerName); |
|
| 278 | 283 |
((FilesystemStoreParameters) params).setFile(file); |
| 279 | 284 |
return params; |
| 280 | 285 |
|
| ... | ... | |
| 452 | 457 |
|
| 453 | 458 |
public NewDataStoreParameters getAddParameters(File file) |
| 454 | 459 |
throws DataException {
|
| 455 |
DataStoreParameters params = this.getParametersFor(file, false); |
|
| 460 |
DataStoreParameters params = this.getParametersFor(file, null, false);
|
|
| 456 | 461 |
NewDataStoreParameters newParams = this.getAddParameters(params |
| 457 | 462 |
.getDataStoreName()); |
| 458 | 463 |
((FilesystemStoreParameters) newParams) |
| branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/serverexplorer/filesystem/FilesystemServerExplorer.java | ||
|---|---|---|
| 54 | 54 |
|
| 55 | 55 |
public DataStoreParameters createStoreParameters(File file) |
| 56 | 56 |
throws DataException; |
| 57 |
public DataStoreParameters createStoreParameters(File file, String providerName) |
|
| 58 |
throws DataException; |
|
| 57 | 59 |
|
| 58 | 60 |
// public DataStore open(File file) throws DataException, |
| 59 | 61 |
// ValidateDataParametersException; |
Also available in: Unified diff