/ - Diff - Application: gvSIG desktop - gvSIG

         public static final String PROVIDERS_DESCRIPTION = "Installer providers";
         public DynObjectManager dynObjectManager = null;
         private static final String INSTALL_INFO_FILE = "package.info";
         public DefaultInstallerProviderManager() {
             super();
             this.dynObjectManager = ToolsLocator.getDynObjectManager();
-...
             return new DefaultInstallerProviderServices();
+        }
         public String getPackageInfoFileName() {
             return INSTALL_INFO_FILE;
+        }
+    }

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/DefaultPackageInfo.java
235	235	return this;
236	236	}
237	237
	238	@Override
	239	public Object clone() throws CloneNotSupportedException {
	240	DefaultPackageInfo clone = (DefaultPackageInfo) super.clone();
	241	clone.selectedFiles = new ArrayList<File>(selectedFiles);
	242	return clone;
	243	}
238	244	}

     	private ExtensionPointManager extensionPoints = ToolsLocator
     			.getExtensionPointManager();
     	private String packageSetNameFormat = "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspks";
         private String packageSetNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspks";
     	private String packageNameFormat = "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspkg";
         private String packageNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspkg";
         private String packageIndexNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspki";
     	public DefaultInstallerManager() {
     		super(new DefaultInstallerProviderManager());
+    	}
-...
     		this.packageNameFormat = packageNameFormat;
+    	}
     	public MakePluginPackageService getMakePluginPackageService(
         public String getPackageIndexNameFormat() {
             return packageIndexNameFormat;
+        }
         public void setPackageIndexNameFormat(String packageIndexNameFormat) {
             this.packageIndexNameFormat = packageIndexNameFormat;
+        }
         public MakePluginPackageService getMakePluginPackageService(
     			File pluginsDirectory) throws MakePluginPackageServiceException {
     		ExtensionPoint ep = extensionPoints
     				.add(INSTALLER_MANAGER_EXTENSION_POINT);
-...
     		return MessageFormat.format(getPackageNameFormat(), parameters);
+    	}
         public String getPackageIndexFileName(PackageInfo info) {
             Object[] parameters = getPackageNameFormatParameters(info);
             return MessageFormat.format(getPackageIndexNameFormat(), parameters);
+        }
     	private Object[] getPackageNameFormatParameters(PackageInfo info) {
     		Object[] parameters = new Object[8];
     		parameters[PACKAGE_FILE_NAME_FIELDS.GVSIG_VERSION] = info

     import org.gvsig.installer.lib.impl.DefaultPackageInfo;
     import org.gvsig.installer.lib.impl.info.InstallerInfoFileReader;
     import org.gvsig.installer.lib.spi.InstallerInfoFileException;
     import org.gvsig.installer.lib.spi.InstallerProviderLocator;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
-...
             throws ZipException, IOException, InstallerInfoFileException {
             ZipEntry entry = null;
             int installerInfoNumber = zipEntriesMap.size();
             String packageInfoName = getPackageInfoFileName();
             String unixPackageInfoPath = "/".concat(packageInfoName);
             String windowsPackageInfoPath = "\\".concat(packageInfoName);
             while ((entry = zipInputStream.getNextEntry()) != null) {
                 logger.debug("Extracting: " + entry.getName());
                 String name = entry.getName();
                 if (name.endsWith("/package.info")
                     || name.endsWith("\\package.info")) {
                 // Just in case, but we are going to create them always using
                 // the unix file separator
                 if (name.endsWith(unixPackageInfoPath)
                     || name.endsWith(windowsPackageInfoPath)) {
                     PackageInfo installerInfo = readInstallInfo(zipInputStream);
                     zipEntriesMap.put(installerInfo, zipEntryName);
                     readedIinstallerInfos.add(installerInfo);
-...
             return installerInfo;
+        }
         private String getPackageInfoFileName() {
             return InstallerProviderLocator.getProviderManager()
                 .getPackageInfoFileName();
+        }
+    }

     import java.util.zip.ZipEntry;
     import java.util.zip.ZipOutputStream;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.spi.InstallerProviderLocator;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class Compress {
         static final int BUFFER = 2048;
         private static final Logger logger = LoggerFactory
             .getLogger(Compress.class);
         private static final int BUFFER = 2048;
         public Compress() {
             super();
+        }
         public void compressPluginAsPackageSet(File file, String fileName,
             OutputStream os) throws MakePluginPackageServiceException {
             List<File> files = new ArrayList<File>();
-...
+                }
                 zos.close();
             } catch (Exception e) {
                 logger.error("Error compressing the plugin");
                 throw new MakePluginPackageServiceException(
                     "Error writing the plugin", e);
                     "Error compressing as package set the plugin files: " + files,
                     e);
+            }
+        }
-...
                 zos.close();
             } catch (IOException e) {
                 throw new MakePluginPackageServiceException(
                     "Error compressing the plugin folder: " + folder, e);
                     "Error compressing as package the plugin folder: " + folder, e);
+            }
+        }
         public void compressPluginAsPackageIndex(File folder, OutputStream os)
             throws MakePluginPackageServiceException {
             ZipOutputStream zos = new ZipOutputStream(os);
             try {
                 int parentFileLength = folder.getParentFile().toString().length();
                 String folderName =
                     folder.toString()
                         .substring(parentFileLength + 1, folder.toString().length());
                 File infoFile =
                     new File(folder, getPackageInfoFileName() + ".index");
                 byte[] buf = new byte[1024];
                 int len;
                 ZipEntry zipEntry =
                     new ZipEntry(folderName + File.separator
                         + getPackageInfoFileName());
                 zos.putNextEntry(zipEntry);
                 FileInputStream fin = new FileInputStream(infoFile);
                 BufferedInputStream in = new BufferedInputStream(fin);
                 while ((len = in.read(buf)) >= 0) {
                     zos.write(buf, 0, len);
+                }
                 in.close();
                 zos.closeEntry();
                 zos.flush();
                 zos.close();
             } catch (IOException e) {
                 throw new MakePluginPackageServiceException(
                     "Error compressing as package index the plugin folder: "
                         + folder, e);
+            }
+        }
         private void compressPluginFiles(File fileOrFolder, ZipOutputStream zos)
             throws IOException {
             int parentFileLenght = fileOrFolder.getParentFile().toString().length();
-...
                 zosPlugin.closeEntry();
+            }
+        }
         private String getPackageInfoFileName() {
             return InstallerProviderLocator.getProviderManager()
                 .getPackageInfoFileName();
+        }
+    }

     import org.gvsig.installer.lib.impl.utils.Decompress;
     import org.gvsig.installer.lib.spi.InstallPackageProviderServices;
     import org.gvsig.installer.lib.spi.InstallerInfoFileException;
     import org.gvsig.installer.lib.spi.InstallerProviderLocator;
     import org.gvsig.tools.service.spi.AbstractProviderServices;
     /**
-...
     	private static final Logger LOG = LoggerFactory
     			.getLogger(DefaultInstallerProviderServices.class);
     	private static final String INSTALL_INFO_FILE = "package.info";
     	public void decompress(InputStream is, File outputDirectory)
     			throws InstallPackageServiceException {
     		Decompress decompress = new Decompress();
-...
     		compress.compressPluginAsPackage(folder, os);
+    	}
         public void compressPackageIndex(File folder, OutputStream os)
             throws MakePluginPackageServiceException {
             Compress compress = new Compress();
             compress.compressPluginAsPackageIndex(folder, os);
+        }
     	public void readPackageInfo(File directory, PackageInfo installerInfo)
     			throws InstallerInfoFileException {
     		File installInfoFile = new File(directory + File.separator
     				+ INSTALL_INFO_FILE);
      + getPackageInfoFileName());
     		if (installInfoFile.exists()) {
     			InstallerInfoFileReader reader = new InstallerInfoFileReader();
     			reader.read(installerInfo, installInfoFile.getAbsolutePath());
-...
+    		}
+    	}
     	public void writePackageInfo(File directory, PackageInfo installerInfo)
         private String getPackageInfoFileName() {
             return InstallerProviderLocator.getProviderManager()
                 .getPackageInfoFileName();
+        }
         public void writePackageInfo(File directory, PackageInfo packageInfo)
     			throws InstallerInfoFileException {
     		if (!directory.exists()) {
     			throw new InstallerInfoFileException("The directory doesn't exist");
+    		}
     		InstallerInfoFileWriter installerInfoFileWriter = new InstallerInfoFileWriter();
     		installerInfoFileWriter.write(installerInfo, directory + File.separator
     				+ INSTALL_INFO_FILE);
             writePackageInfoFile(directory, getPackageInfoFileName(), packageInfo);
+    	}
     	public InputStream searchPackage(InputStream is, String zipEntry)
         public void writePackageInfoForIndex(File directory, PackageInfo packageInfo)
             throws InstallerInfoFileException {
             writePackageInfoFile(directory, getPackageInfoFileName() + ".index",
                 packageInfo);
+        }
         private void writePackageInfoFile(File directory, String fileName,
             PackageInfo installerInfo) throws InstallerInfoFileException {
             if (!directory.exists()) {
                 throw new InstallerInfoFileException("The directory doesn't exist");
+            }
             InstallerInfoFileWriter installerInfoFileWriter =
                 new InstallerInfoFileWriter();
             installerInfoFileWriter.write(installerInfo, directory + File.separator
                 + fileName);
+        }
         public InputStream searchPackage(InputStream is, String zipEntry)
     			throws InstallPackageServiceException {
     		Decompress decompress = new Decompress();
     		return decompress.searchPlugin(is, zipEntry);
-...
     		// not found
     		return null;
+    	}
+    }

     				getAbsolutePluginPackageDirectory(packageInfo), packageStream);
+    	}
         public void createPackageIndex(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException {
             LOG.debug("Creating package index of the package info: \n{0}",
                 packageInfo);
             installerProviderServices.compressPackageIndex(
                 getAbsolutePluginPackageDirectory(packageInfo), packageStream);
+        }
     	private void writePackageInfo(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		writePackageInfo(packageInfo,
-...
     		installerProviderServices.writePackageInfo(folder, packageInfo);
+    	}
         public void writePackageInfoForIndex(PackageInfo packageInfo, File folder)
             throws MakePluginPackageServiceException {
             installerProviderServices.writePackageInfoForIndex(folder, packageInfo);
+        }
     	private void writeAntFile(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		try {
-...
     			throws MakePluginPackageServiceException {
     		return installerInfos.toArray(new PackageInfo[installerInfos.size()]);
+    	}
         public File getPluginFolder(PackageInfo packageInfo)
             throws MakePluginPackageServiceException {
             return getAbsolutePluginPackageDirectory(packageInfo);
+        }
+    }

             OutputStream packageStream) throws MakePluginPackageServiceException;
         /**
          * It creates the index for a package of a plugin. This file may be used
          * to be included in the main gvSIG remote index, or downloaded as it is.
+         *
          * @param packageInfo
          *            the information of the plugin that has to be included in the
          *            package index
          * @param packageStream
          *            the stream where the the package index will be created
          * @throws MakePluginPackageServiceException
          *             it is thrown when there is an exception creating the
          *             package
          */
         public void createPackageIndex(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException;
         /**
          * Writes a package info file with the information provided.
+         *
          * @param packageInfo
-...
             throws MakePluginPackageServiceException;
         /**
          * Writes a package info file with the information provided.
+         *
          * @param packageInfo
          *            the package that has to be written into the file
          * @param folder
          *            the folder where the file is to be created
          * @throws MakePluginPackageServiceException
          *             it is thrown when there is an exception writing the file
          */
         public void writePackageInfoForIndex(PackageInfo packageInfo, File folder)
             throws MakePluginPackageServiceException;
         /**
          * It returns the number of plugin packages that are installed in the folder
          * that has been added using the constructor. It can be used in an iteration
          * process combined with the {@link #getPluginPackageInfo(int)} method to
-...
          */
         public PackageInfo[] getInstalledPackages()
             throws MakePluginPackageServiceException;
         /**
          * Returns the folder where a plugin is located.
+         *
          * @param selectedPackageInfo
          *            the info of theplugin to look for
          * @return the plugin's folder
          * @throws MakePluginPackageServiceException
          *             if there is an error locating
          *             the folder
          */
         public File getPluginFolder(PackageInfo packageInfo)
             throws MakePluginPackageServiceException;
+    }

     import org.gvsig.installer.lib.api.InstallerManager.JVM;
     import org.gvsig.installer.lib.api.InstallerManager.OS;
     import org.gvsig.installer.lib.api.InstallerManager.STATE;
     import org.gvsig.tools.lang.Cloneable;
     /**
      * Information of a package that is used on the installation process.
-...
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface PackageInfo {
     public interface PackageInfo extends Cloneable {
         /**
          * @return

         public String getPackageFileName(PackageInfo info);
         /**
          * Returns the name of the package index file for a given package info.
+         *
          * @param info
          *            of the plugin
          * @return the name of the package index file
          */
         public String getPackageIndexFileName(PackageInfo info);
         /**
          * It registers a class that implements the service for the installation
          * of a package that is inside a bundle. This class has to implement
          * the {@link InstallPackageService} interface.

             throws MakePluginPackageServiceException;
         /**
          * Compress a plugin folder using the plugin's name as a package, only
          * with the files needed by the package index.
+         *
          * @param folder
          *            the directory to compress.
          * @param os
          *            output stream to write the output.
          * @throws MakePluginPackageServiceException
          *             if there is any problem compressing.
          */
         public void compressPackageIndex(File folder, OutputStream os)
             throws MakePluginPackageServiceException;
         /**
          * Reads the package.info file from a directory a fills the the properties
          * of the {@link PackageInfo} object.
+         *
-...
             throws InstallerInfoFileException;
         /**
          * Writes the package.info file in a concrete directory to be used in
          * a package index.
+         *
          * @param directory
          *            the directory.
          * @param packageInfo
          *            the information to write.
          * @throws InstallerInfoFileException
          *             if there is any problem writing the package.info file.
          */
         public void writePackageInfoForIndex(File directory, PackageInfo packageInfo)
             throws InstallerInfoFileException;
         /**
          * It search a package inside an installer file by the zip name and returns
          * the stream in this position ready to decompres.
+         *

          */
         public InstallPackageProviderServices createInstallerProviderServices();
         /**
          * Returns the name to use for the package info file.
+         *
          * @return the name of the package info file
          */
         public String getPackageInfoFileName();
+    }

         private WizardPanelWithLogo wizardPanelWithLogo = null;
         private MakePluginPackageService makePluginPackageService = null;
         private OutputStream outputStream = null;
         private OutputStream indexOutputStream;
         private PackageInfo selectedPackageInfo = null;
         // Wizards
-...
         private SelectPlugintoInstallWizard selectPlugintoInstallWizard = null;
         private WizardListenerAdapter wizardListenerAdapter = null;
         private URL downloadURL;
         public DefaultMakePluginPackageWizard(File applicationFolder,
             File pluginsFolder, File installFolder) throws LocatorException,
-...
             selectFilesWizard.setApplicationDirectory(applicationFolder);
+        }
         public MakePluginPackageService getMakePluginPackageService() {
             return makePluginPackageService;
+        }
         private void addWizards() {
             wizardPanelWithLogo.addOptionPanel(selectPlugintoInstallWizard);
             wizardPanelWithLogo.addOptionPanel(pluginDescriptionWizard);
-...
             this.outputStream = outputStream;
+        }
         public OutputStream getIndexOutputStream() {
             return indexOutputStream;
+        }
         public void setIndexOutputStream(OutputStream outputStream) {
             this.indexOutputStream = outputStream;
+        }
         public PackageInfo getSelectedPackageInfo() {
             return selectedPackageInfo;
+        }
-...
             // TODO Auto-generated method stub
+        }
         public void setDownloadURL(URL downloadURL) {
             this.downloadURL = downloadURL;
+        }
         public URL getDownloadURL() {
             return downloadURL;
+        }
+    }

     import java.awt.BorderLayout;
     import java.awt.GridBagConstraints;
     import java.awt.GridBagLayout;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.io.File;
     import java.net.MalformedURLException;
     import java.net.URL;
     import javax.swing.JCheckBox;
     import javax.swing.JLabel;
     import javax.swing.JPanel;
     import javax.swing.JTextField;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.gui.beans.openfile.FileTextField;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     import org.gvsig.installer.swing.impl.DefaultSwingInstallerManager;
-...
      */
     public abstract class SelectOutputFilePanel extends JPanel {
         /**
+         *
          */
         private static final Logger LOG = LoggerFactory
             .getLogger(SelectOutputFilePanel.class);
         private static final long serialVersionUID = 1219577194134960697L;
         protected DefaultSwingInstallerManager swingInstallerManager = null;
         private JLabel fileLabel;
         protected FileTextField fileTextField;
         private JLabel createPackageIndexLabel;
         private JCheckBox createPackageIndexCheckBox;
         private JLabel packageURLLabel;
         protected JTextField packageURLTextField;
         private JLabel indexFileLabel;
         protected FileTextField indexFileTextField;
         private javax.swing.JPanel northPanel;
         public SelectOutputFilePanel() {
-...
                 (DefaultSwingInstallerManager) SwingInstallerLocator
                     .getSwingInstallerManager();
             initComponents();
             initLabels();
+        }
         private void initLabels() {
             fileLabel.setText(swingInstallerManager.getText("file") + ":");
+        }
         private void initComponents() {
             java.awt.GridBagConstraints gridBagConstraints;
             GridBagConstraints gridBagConstraints;
             northPanel = new JPanel();
             fileLabel = new JLabel();
             fileTextField = new FileTextField(getClass().getName());
             fileLabel =
                 new JLabel(swingInstallerManager.getText("package_file") + ":");
             fileTextField = new FileTextField("package.file");
             indexFileLabel =
                 new JLabel(swingInstallerManager.getText("package_index_file")
                     + ":");
             packageURLLabel =
                 new JLabel(swingInstallerManager.getText("download_url") + ":");
             packageURLTextField = new JTextField();
             packageURLTextField.setEnabled(false);
             indexFileTextField = new FileTextField("package.index.file");
             indexFileTextField.setEnabled(false);
             createPackageIndexLabel =
                 new JLabel(swingInstallerManager.getText("create_package_index")
                     + ":");
             createPackageIndexCheckBox = new JCheckBox();
             createPackageIndexCheckBox.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     if (createPackageIndexCheckBox.isSelected()) {
                         packageURLTextField.setEnabled(true);
                         indexFileTextField.setEnabled(true);
+                    }
                     else {
                         packageURLTextField.setEnabled(false);
                         indexFileTextField.setEnabled(false);
+                    }
+                }
             });
             setLayout(new BorderLayout());
             northPanel.setLayout(new GridBagLayout());
             northPanel.add(fileLabel, new GridBagConstraints());
             // Package file
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 0;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             northPanel.add(fileLabel, gridBagConstraints);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 0;
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             northPanel.add(fileTextField, gridBagConstraints);
             // Package index check
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 1;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             northPanel.add(createPackageIndexLabel, gridBagConstraints);
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 1;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             createPackageIndexCheckBox.setAlignmentX(LEFT_ALIGNMENT);
             northPanel.add(createPackageIndexCheckBox, gridBagConstraints);
             // Package download URL
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 2;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             northPanel.add(packageURLLabel, gridBagConstraints);
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 2;
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             northPanel.add(packageURLTextField, gridBagConstraints);
             // Package index file
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 3;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             northPanel.add(indexFileLabel, gridBagConstraints);
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 3;
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             northPanel.add(indexFileTextField, gridBagConstraints);
             add(northPanel, BorderLayout.NORTH);
+        }
-...
         protected void setSelectedFile(File selectedFile) {
             fileTextField.setSelectedFile(selectedFile);
+        }
         public boolean isCreatePackageIndex() {
             return createPackageIndexCheckBox.isSelected();
+        }
         public void setCreatePackageIndex(boolean create) {
             createPackageIndexCheckBox.setSelected(create);
+        }
         public File getSelectedIndexFile() {
             if (isCreatePackageIndex()) {
                 return indexFileTextField.getSelectedFile();
             } else {
                 return null;
+            }
+        }
         protected void setSelectedIndexFile(File selectedIndexFile) {
             indexFileTextField.setSelectedFile(selectedIndexFile);
+        }
         public URL getDownloadURL() {
             if (isCreatePackageIndex()) {
                 try {
                     return new URL(packageURLTextField.getText());
                 } catch (MalformedURLException e) {
                     LOG.error(
                         "Invalid download URL: " + packageURLTextField.getText(), e);
                     return null;
+                }
             } else {
                 return null;
+            }
+        }
         public void setDownloadURL(URL downloadURL) {
             packageURLTextField.setText(downloadURL.toString());
+        }
+    }

             try {
                 installerCreationWizard.setOutputStream(new FileOutputStream(
                     getSelectedFile()));
                 if (isCreatePackageIndex()) {
                     installerCreationWizard.setDownloadURL(getDownloadURL());
                     installerCreationWizard
                         .setIndexOutputStream(new FileOutputStream(
                             getSelectedIndexFile()));
+                }
             } catch (FileNotFoundException e) {
                 logger.error(
                     swingInstallerManager.getText("create_output_file_exception"),
-...
         public void updatePanel() {
             setSelectedFile(getDefaultPackageBundleFile());
             setSelectedIndexFile(getDefaultPackageIndexBundleFile());
+        }
         private File getDefaultPackageBundleFile() {
-...
             return new File(installsFolder, fileName);
+        }
         private File getDefaultPackageIndexBundleFile() {
             File installsFolder = installerCreationWizard.getInstallFolder();
             PackageInfo info = installerCreationWizard.getSelectedPackageInfo();
             String fileName =
                 InstallerLocator.getInstallerManager()
                     .getPackageIndexFileName(info);
             return new File(installsFolder, fileName);
+        }
+    }

     package org.gvsig.installer.swing.impl.creation.wizard;
     import java.io.File;
     import javax.swing.JPanel;
     import org.slf4j.Logger;
-...
                 setCompressingText();
                 installerCreationService.createPackageSet(packageInfo,
                     installerCreationWizard.getOutputStream());
                 if (installerCreationWizard.getIndexOutputStream() != null) {
                     setCreatingIndexText();
                     setProgress(50);
                     PackageInfo info =
                         installerCreationWizard.getSelectedPackageInfo();
                     File pluginFolder =
                         installerCreationWizard.getMakePluginPackageService()
                             .getPluginFolder(info);
                     PackageInfo infoIndex = (PackageInfo) info.clone();
                     infoIndex.setDownloadURL(installerCreationWizard
                         .getDownloadURL());
                     installerCreationService.writePackageInfoForIndex(infoIndex,
                         pluginFolder);
                     installerCreationService.createPackageIndex(info,
                         installerCreationWizard.getIndexOutputStream());
+                }
                 setProgress(100);
                 // Set the finished text
-...
                     swingInstallerManager.getText("create_output_file_exception"),
                     e);
                 setExceptionText(e);
             } catch (CloneNotSupportedException e) {
                 logger.error(
                     swingInstallerManager.getText("create_output_file_exception"),
                     e);
                 setExceptionText(e);
+            }
             setProgress(100);
             installerCreationWizard.setFinishButtonEnabled(true);
             installerCreationWizard.setCancelButtonEnabled(false);

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/panel/ProgressPanel.java
110	110	progressLabel.setText(swingInstallerManager.getText("compressing"));
111	111	}
112	112
	113	public void setCreatingIndexText() {
	114	progressLabel.setText(swingInstallerManager.getText("creating_index"));
	115	}
	116
113	117	public void setFinishedText() {
114	118	progressLabel.setText(swingInstallerManager.getText("finished"));
115	119	}

     architecture=Arquitectura
     java_version=Versi?n m?nima de java
     gvSIG_version=Versi?n m?nima de gvSIG
     creating_index=Creando ?ndice del paquete de instalaci?n
     create_package_index=?Crear ?ndice de paquete de instalaci?n?
     package_index_file=Archivo de ?ndice de paquete
     package_file=Archivo de paquete de instalaci?n

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/resources/locale/text_en.properties
41	41	architecture=Architecture
42	42	java_version=Java minimum version
43	43	gvSIG_version=gvSIG minimum version
	44	create_package_index=Create installation package index?
	45	package_index_file=Index package file
	46	package_file=Package file

Application: gvSIG desktop

Revision 34444