Revision 27 trunk/org.gvsig.customize.app/org.gvsig.customize.app.mainplugin/src/main/java/org/gvsig/customize/DistributionParametersPanel.java

View differences:

DistributionParametersPanel.java
349 349
        } catch (IOException ex) {
350 350
            logger.warn("Can't load defaultPackages from '" + packages.getAbsolutePath() + "'.", ex);
351 351
        } finally {
352
            message("");         
352
            message("");
353 353
        }
354 354
    }
355 355

  
......
419 419

  
420 420
            @Override
421 421
            public void run() {
422
                message("Updating package set");
423
                File packageSet = getPackageSet();
424
                if (packageSet == null) {
425
                    return;
426
                }
427
                if (getWorkingFolder() == null) {
428
                    return;
429
                }
422
                FileSystem zipfs = null;
423
                try {
424
                    File packageSet = getPackageSet();
425
                    if (packageSet == null) {
426
                        return;
427
                    }
428
                    if (getWorkingFolder() == null) {
429
                        return;
430
                    }
430 431

  
431
                File packagesetFolder = getPackageSetFolder();
432
                if (packagesetFolder.exists()) {
433
                    try {
434
                        FileUtils.deleteDirectory(packagesetFolder);
435
                    } catch (IOException ex) {
436
                        message("Can't delete 'packages' directory. " + ex.getMessage());
432
                    message("Updating package set");
433
                    File packagesetFolder = getPackageSetFolder();
434
                    if (packagesetFolder.exists()) {
435
                        try {
436
                            FileUtils.deleteDirectory(packagesetFolder);
437
                        } catch (IOException ex) {
438
                            message("Can't delete 'packages' directory. " + ex.getMessage());
439
                        }
437 440
                    }
438
                }
439
                packagesetFolder.mkdir();
441
                    packagesetFolder.mkdir();
440 442

  
441
                Map<String, String> env = new HashMap<>();
442
                env.put("create", "true");
443
                    Map<String, String> env = new HashMap<>();
444
                    env.put("create", "true");
443 445

  
444
                FileSystem zipfs = null;
445
                try {
446 446
                    Path zippath = Paths.get(packageSet.getAbsolutePath());
447 447
                    zipfs = FileSystems.newFileSystem(zippath, null);
448 448
                    Iterable<Path> dirs = zipfs.getRootDirectories();
......
451 451
                        for (Path file : stream) {
452 452
                            FileOutputStream fos = null;
453 453
                            try {
454
                                message("Extracting "+file.getFileName()+"...");
454
                                message("Extracting " + file.getFileName() + "...");
455 455
                                fos = new FileOutputStream(new File(packagesetFolder, file.getFileName().toString()));
456 456
                                Files.copy(file, fos);
457 457
                            } catch (IOException | DirectoryIteratorException x) {

Also available in: Unified diff