Revision 44663 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/installer/icontheme/IconThemeInstaller.java

View differences:

IconThemeInstaller.java
50 50

  
51 51
public class IconThemeInstaller extends AbstractProvider implements InstallPackageProvider {
52 52

  
53
    private static final Logger logger = LoggerFactory.getLogger(IconThemeInstaller.class);
53
    private static final Logger LOGGER = LoggerFactory.getLogger(IconThemeInstaller.class);
54 54
    
55 55
    private final int BUFFER = 2048;
56 56
    
......
60 60

  
61 61
    @Override
62 62
    public void install(File applicationFolder, InputStream inputStream, PackageInfo packageInfo) throws InstallPackageServiceException {
63
        IconThemeManager iconThemeManager = ToolsSwingLocator.getIconThemeManager();
64
        File folder = iconThemeManager.getRepository().asFile();        
65
	logger.info("Installing package '"+packageInfo.getCode()+"' in '"+folder.getAbsolutePath()+"'.");
63
        File folder = null;
66 64
        try {
65
            IconThemeManager iconThemeManager = ToolsSwingLocator.getIconThemeManager();
66
            folder = iconThemeManager.getRepository().asFile();        
67

  
68
            LOGGER.info("Installing package '"+(packageInfo==null?"NULL":packageInfo.getCode())+"' in folder '"+(folder==null?"NULL":folder.getAbsolutePath())+"'.");
67 69
            if (!folder.exists()) {
68 70
                String s = "Can install package '"+packageInfo.getCode()+"', install folder '"+folder+"' does not exists.";
69
		logger.warn(s);
71
		LOGGER.warn(s);
70 72
		throw new RuntimeException(s);
71 73
            }
72 74
            decompress(inputStream, folder);
73 75
        } catch (Exception e) {
74 76
            try {
75
                logger.warn("Can install package '"+packageInfo.getCode()+"'.", e);
77
                LOGGER.warn("Can install package '"+(packageInfo==null?"NULL":packageInfo.getCode())+"' in folder '"+(folder==null?"NULL":folder.getAbsolutePath())+"'.", e);
76 78
                // if there is an exception, installLater is called
77 79
                installLater(applicationFolder, inputStream, packageInfo);
78 80
            } catch (IOException e1) {
79
                logger.warn("Can install package '"+packageInfo.getCode()+"'.", e1);
81
                LOGGER.warn("Can install package '"+(packageInfo==null?"NULL":packageInfo.getCode())+"' in folder '"+(folder==null?"NULL":folder.getAbsolutePath())+"'.", e);
80 82
                throw new InstallPackageServiceException(e1);
81 83
            }
82 84
        }
......
113 115
                    if( !file.getParentFile().exists() ) {
114 116
                        FileUtils.forceMkdir(file.getParentFile());
115 117
                    }
116
                    logger.debug("extracting " + file.getAbsolutePath());
118
                    LOGGER.debug("extracting " + file.getAbsolutePath());
117 119
                    try (FileOutputStream fos = new FileOutputStream(file)) {
118 120
                        while ((count = zis.read(data, 0, BUFFER)) != -1) {
119 121
                            fos.write(data, 0, count);
......
126 128
            }
127 129
            zis.close();
128 130
        } catch(Exception ex) {
129
                logger.warn("Problems uncompresing 'translations' (last entry '"+entryName+"'.",ex);
131
                LOGGER.warn("Problems uncompresing 'translations' (last entry '"+entryName+"'.",ex);
130 132
                throw ex;
131 133
        } finally {
132 134
            taskStatus.remove();
......
137 139
    
138 140
    @Override
139 141
    public void installLater(File applicationDirectory, InputStream inputStream, PackageInfo packageInfo) throws InstallPackageServiceException, IOException {
140
        logger.warn("installLater is not implementes.");
142
        LOGGER.warn("installLater is not implementes.");
141 143
    }
142 144

  
143 145
}

Also available in: Unified diff