Revision 43126 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.installer.app/org.gvsig.installer.app.mainplugin/src/main/java/org/gvsig/installer/app/extension/execution/InstallPackageExtension.java

View differences:

InstallPackageExtension.java
47 47
import org.slf4j.Logger;
48 48
import org.slf4j.LoggerFactory;
49 49

  
50
/**
51
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
52
 */
53 50
public class InstallPackageExtension extends Extension {
54 51

  
55 52
    private static final Logger logger = LoggerFactory
56 53
            .getLogger(InstallPackageExtension.class);
57 54

  
55
    @Override
58 56
    public void execute(String actionCommand) {
59 57
        this.execute(actionCommand, null);
60 58
    }
61 59

  
60
    @Override
62 61
    public void execute(String actionCommand, Object[] args) {
63 62

  
64 63
        if ("tools-addonsmanager".equalsIgnoreCase(actionCommand)) {
......
76 75

  
77 76
        PluginsManager pluginManager = PluginsLocator.getManager();
78 77
        
79
        String cmd = null;
78
        String cmd;
80 79
        boolean useInternalAddonsManager = false;
81 80

  
82 81
        if( InstallerManager.OS.WINDOWS.equalsIgnoreCase(installManager.getOperatingSystem()) ) {
......
127 126
                    )
128 127
            );
129 128
        } catch (Error e) {
130
            logger.error("Error creating the wizard to install a package ", e);
131
        } catch (Exception e) {
132
            logger.error("Error creating the wizard to install a package ", e);
129
            logger.warn("Error creating the wizard to install a package ", e);
130
        } catch (Throwable e) {
131
            logger.warn("Error creating the wizard to install a package ", e);
133 132
        }
134 133

  
135 134
    }
136 135

  
136
    @Override
137 137
    public void initialize() {
138 138
        PluginsManager pm = PluginsLocator.getManager();
139 139
        PackageInfo packageInfo = pm.getPackageInfo();
......
153 153
                manager.setDefaultDownloadURL(
154 154
                        new File( pm.getPlugin(this).getPluginDirectory(),"defaultDownloadsURLs")
155 155
                );
156
                if (packageInfo != null && (packageInfo.getState().startsWith(InstallerManager.STATE.BETA)
157
                        || packageInfo.getState().startsWith(InstallerManager.STATE.RC)
158
                        || packageInfo.getState().equalsIgnoreCase(InstallerManager.STATE.FINAL))) {
159

  
156
                if( packageInfo.getState().startsWith(InstallerManager.STATE.BETA) ||
157
                    packageInfo.getState().startsWith(InstallerManager.STATE.RC) ||
158
                    packageInfo.getState().equalsIgnoreCase(InstallerManager.STATE.FINAL) 
159
                    ) {
160 160
                    String installURL = manager.getInstallerManager().getDownloadBaseURL().toString()
161 161
                            + "dists/<%Version%>/builds/<%Build%>/packages.gvspki ## Official gvSIG repository (frozen in this version)";
162 162
                    manager.addDefaultDownloadURL(installURL);
......
165 165
                logger.info("Error. Can't select default gvspki", th);
166 166
            }
167 167

  
168
            InputStream is = this.getClass().getResourceAsStream(
169
                    "/defaultDownloadsURLs");
168
            InputStream is = this.getClass().getResourceAsStream("/defaultDownloadsURLs");
170 169
            BufferedReader in = new BufferedReader(new InputStreamReader(is));
171
            String line = null;
172
            for (line = in.readLine(); line != null; line = in.readLine()) {
170
            for (String line = in.readLine(); line != null; line = in.readLine()) {
173 171
                try {
174 172
                    manager.addDefaultDownloadURL(line);
175 173
                } catch (MalformedURLException e) {
176
                    logger.error(
177
                            "Error creating the default packages download URL pointing to "
178
                            + line, e);
174
                    logger.warn(
175
                        "Error creating the default packages download URL pointing to " + line,
176
                        e
177
                    );
179 178
                }
180 179
            }
181 180
            manager.getInstallerManager().setVersion(version);
182 181
        } catch (Throwable e) {
183
            logger.error("Error reading the default packages download URL file "
184
                    + "/defaultDownloadsURLs", e);
182
            logger.warn(
183
                "Error reading the default packages download URL file /defaultDownloadsURLs",
184
                e
185
            );
185 186
        }
186 187
    }
187 188

  
189
    @Override
188 190
    public boolean isEnabled() {
189 191
        return true;
190 192
    }
191 193

  
194
    @Override
192 195
    public boolean isVisible() {
193 196
        return true;
194 197
    }

Also available in: Unified diff