/ - Diff - | gvSIG desktop 1 - gvSIG

     package org.gvsig.installer.app.extension.execution;
     import java.net.MalformedURLException;
     import java.net.URL;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.plugins.Extension;
     import org.gvsig.installer.app.extension.GvSIGFolders;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
-...
         public void execute(String actionCommand) {
             GvSIGFolders folders = new GvSIGFolders();
             try {
                 PluginServices.getMDIManager().addCentredWindow(
                     new InstallPackageWindow(folders.getApplicationFolder(),
                         folders.getPluginsFolder(), folders.getInstallFolder()));
             } catch (Exception e) {
                 LOG.error("Error creating teh wizard to install a package ", e);
                 LOG.error("Error creating the wizard to install a package ", e);
+            }
+        }
         public void initialize() {
             // TODO: move to user preferences or an external configuration file
             String packageDownloadURL =
                 "http://gvsig-desktop.forge.osor.eu/gvSIG-desktop/dists/2.0.0/packages.zip";
             try {
                 SwingInstallerLocator.getSwingInstallerManager()
                     .setDefaultDownloadURL(new URL(packageDownloadURL));
             } catch (MalformedURLException e) {
                 LOG.error(
                     "Error creating the default packages download URL pointing to"
                         + packageDownloadURL, e);
+            }
+        }
         public boolean isEnabled() {

+         *
          * @param fileURL
          *            to download the file from
          * @param defaultFileName
          *            default name for the file. If the URL ends with / the file
          *            name will be appended to the URL. If null it will be ignored
          * @return the temporal downloaded file
          * @throws IOException
          *             if there is an error downloading the file
          */
         public File downloadFile(URL fileURL) throws IOException;
         public File downloadFile(URL fileURL, String defaultFileName)
             throws IOException;
+    }

             decompress.readInstallInfo(is, installerInfos, zipEntriesMap);
+        }
         public File downloadFile(URL bundleURL) throws IOException {
             URLConnection connection = bundleURL.openConnection();
         public File downloadFile(URL bundleURL, String defaultFileName)
             throws IOException {
             URL downloadURL = bundleURL;
             // check if the URL ends with '/' and append the file name
             if (defaultFileName != null) {
                 String urlStr = bundleURL.toString();
                 if (urlStr.endsWith("/")) {
                     urlStr = urlStr.concat(defaultFileName);
                     downloadURL = new URL(urlStr);
+                }
+            }
             URLConnection connection = downloadURL.openConnection();
             String fileName = getFileName(connection);
             if (LOG.isDebugEnabled()) {
                 Date date = new Date(connection.getLastModified());
                 LOG.debug(
                     "Downloading file {} from URL {}, with last modified date: {}",
                     new Object[] { fileName, bundleURL, date });
                     new Object[] { fileName, downloadURL, date });
+            }
             String fileNamePrefix = fileName;
-...
+            }
             BufferedInputStream bis =
                 new BufferedInputStream(bundleURL.openStream());
                 new BufferedInputStream(downloadURL.openStream());
             File localFile = File.createTempFile(fileNamePrefix, fileNameSuffix);
             BufferedOutputStream bos =

                 installerExecutionProvider.install(applicationDirectory,
                     packageStream);
             } else {
                 File downloadedBundle = downloadFile(packageInfo.getDownloadURL());
                 File downloadedBundle =
                     downloadFile(packageInfo.getDownloadURL(), null);
                 try {
                     FileInputStream fis = new FileInputStream(downloadedBundle);
                     BufferedInputStream bis = new BufferedInputStream(fis);
-...
+        }
         public void addBundle(URL bundleURL) throws InstallPackageServiceException {
             File bundle = downloadFile(bundleURL);
             File bundle = downloadFile(bundleURL, "packages.zip");
             addBundle(bundle);
+        }
         private File downloadFile(URL bundleURL)
         private File downloadFile(URL bundleURL, String defaultFileName)
             throws InstallPackageServiceException {
             try {
                 return InstallerProviderLocator.getProviderManager()
                     .createInstallerProviderServices().downloadFile(bundleURL);
                     .createInstallerProviderServices()
                     .downloadFile(bundleURL, defaultFileName);
             } catch (IOException e) {
                 throw new InstallPackageServiceException(
                     "Bundle file download error from URL: " + bundleURL, e);

         private JRadioButton standardRadioButton;
         private JTextField urlText;
         private JRadioButton urlRadioButton;
         private final URL defaultDownloadURL;
         public SelectBundlesPanel() {
         public SelectBundlesPanel(URL defaultDownloadURL) {
             super();
             this.defaultDownloadURL = defaultDownloadURL;
             swingInstallerManager =
                 (DefaultSwingInstallerManager) SwingInstallerLocator
                     .getSwingInstallerManager();
-...
             urlRadioButton = new JRadioButton();
             selectFileText = new FileTextField();
             urlText = new JTextField();
             if (defaultDownloadURL != null) {
                 urlText.setText(defaultDownloadURL.toString());
+            }
             buttonGroup = new ButtonGroup();
             buttonGroup.add(standardRadioButton);

     import java.io.File;
     import java.net.MalformedURLException;
     import java.net.URL;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
-...
             .getLogger(SelectBundlesWizard.class);
         public SelectBundlesWizard(
             DefaultInstallPackageWizard installerExecutionWizard) {
             super();
             DefaultInstallPackageWizard installerExecutionWizard,
             URL defaultDownloadURL) {
             super(defaultDownloadURL);
             this.installerExecutionWizard = installerExecutionWizard;
+        }

     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     import org.gvsig.installer.swing.api.execution.InstallPackageWizard;
     import org.gvsig.installer.swing.impl.execution.wizard.ProgressWizard;
     import org.gvsig.installer.swing.impl.execution.wizard.SelectBundlesWizard;
-...
             ImageIcon icon = new ImageIcon(iconURL);
             wizardPanelWithLogo = new WizardPanelWithLogo(icon);
             selectInstallersWizard = new SelectBundlesWizard(this);
             URL downloadURL =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .getDefaultDownloadURL();
             selectInstallersWizard = new SelectBundlesWizard(this, downloadURL);
             selectPluginsWizard = new SelectPackagesWizard(this);
             progressWizard = new ProgressWizard(this);

     package org.gvsig.installer.swing.impl;
     import java.io.File;
     import java.net.URL;
     import org.gvsig.i18n.Messages;
     import org.gvsig.installer.swing.api.SwingInstallerManager;
-...
             .getExtensionPointManager();
         private String applicationVersion = "1.0.0";
         private URL defaultDownloadURL = null;
         public String getText(String key) {
             return Messages.getText(key);
-...
             this.applicationVersion = gvSIGVersion;
+        }
         public URL getDefaultDownloadURL() {
             return defaultDownloadURL;
+        }
         public void setDefaultDownloadURL(URL defaultDownloadURL) {
             this.defaultDownloadURL = defaultDownloadURL;
+        }
+    }

     package org.gvsig.installer.swing.api;
     import java.io.File;
     import java.net.URL;
     import javax.swing.JPanel;
-...
         public void setApplicationVersion(String gvSIGVersion);
         /**
          * Returns the default URL to download packages from.
+         *
          * @return the default URL to download packages from
          */
         public URL getDefaultDownloadURL();
         /**
          * Sets the default URL to download packages from
+         *
          * @param defaultDownloadURL
          *            the default URL to download packages from
          */
         public void setDefaultDownloadURL(URL defaultDownloadURL);
         /**
          * Translate a key in a text using the current application language
+         *
          * @param key

| gvSIG desktop 1

Revision 34003