/ - Diff - Application: gvSIG desktop - gvSIG

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     package org.gvsig.installer.app.extension;
     import java.io.File;
     import org.gvsig.andami.Launcher;
     /**
      * Gets the main gvSIG application folders.
+     *
      * @author gvSIG Team
      * @version $Id$
      */
     public class GvSIGFolders {
         /**
          * Returns the gvSIG main application folder.
+         *
          * @return the gvSIG main application folder
          */
         public File getApplicationFolder() {
             // TODO: check if there is a better way to handle this
             return new File(System.getProperty("user.dir"));
+        }
         /**
          * Returns the gvSIG plugins folder.
+         *
          * @return the gvSIG plugins folder
          */
         public File getPluginsFolder() {
             return new File(Launcher.getAndamiConfig().getPluginsDirectory())
                 .getAbsoluteFile();
+        }
         /**
          * Returns the default gvSIG folder with the installable package bundles.
+         *
          * @return the default gvSIG folder with the installable package bundles
          */
         public File getInstallFolder() {
             return new File(getApplicationFolder(), "install");
+        }
+    }

         private static final long serialVersionUID = 4719868181091291809L;
         WindowInfo windowInfo = null;
         public InstallPackageWindow(File applicationDirectory)
             throws LocatorException, InstallPackageWizardException {
         public InstallPackageWindow(File applicationFolder, File pluginsFolder,
             File installFolder) throws LocatorException,
             InstallPackageWizardException {
             super();
             InstallPackageWizard installPackageWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createInstallPackageWizard(applicationDirectory);
                     .createInstallPackageWizard(applicationFolder, pluginsFolder,
                         installFolder);
             installPackageWizard
                 .setWizardActionListener(new WindowInstallerListener(this));
             this.setLayout(new BorderLayout());

     package org.gvsig.installer.app.extension.execution;
     import java.io.File;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.Launcher;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.plugins.Extension;
     import org.gvsig.installer.app.extension.GvSIGFolders;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallPackageExtension extends Extension {
         private static final Logger log = LoggerFactory
         private static final Logger LOG = LoggerFactory
             .getLogger(InstallPackageExtension.class);
         public void execute(String actionCommand) {
             File pluginsDirectory =
                 new File(Launcher.getAndamiConfig().getPluginsDirectory())
                     .getAbsoluteFile();
             GvSIGFolders folders = new GvSIGFolders();
             try {
                 PluginServices.getMDIManager().addCentredWindow(
                     new InstallPackageWindow(pluginsDirectory.getParentFile()
                         .getParentFile()));
                     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 teh wizard to install a package ", e);
+            }
+        }

         private static final long serialVersionUID = 3423389124323013058L;
         WindowInfo windowInfo = null;
         public MakePluginPackageWindow(File applicationDirectory)
             throws LocatorException, MakePluginPackageWizardException {
         public MakePluginPackageWindow(File applicationFolder, File pluginsFolder,
             File installFolder) throws LocatorException,
             MakePluginPackageWizardException {
             super();
             MakePluginPackageWizard makePluginPackageWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createMakePluginPackageWizard(applicationDirectory);
                     .createMakePluginPackageWizard(applicationFolder,
                         pluginsFolder, installFolder);
             makePluginPackageWizard
                 .setWizardActionListener(new WindowInstallerListener(this));
             this.setLayout(new BorderLayout());

     package org.gvsig.installer.app.extension.creation;
     import java.io.File;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.Launcher;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.plugins.Extension;
     import org.gvsig.app.ApplicationLocator;
     import org.gvsig.app.extension.Version;
     import org.gvsig.installer.app.extension.GvSIGFolders;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     /**
-...
      */
     public class MakePluginPackageExtension extends Extension {
         private static final Logger log = LoggerFactory
         private static final Logger LOG = LoggerFactory
             .getLogger(MakePluginPackageExtension.class);
         public void execute(String actionCommand) {
             File pluginsDirectory =
                 new File(Launcher.getAndamiConfig().getPluginsDirectory())
                     .getAbsoluteFile();
             GvSIGFolders folders = new GvSIGFolders();
             try {
                 PluginServices.getMDIManager().addCentredWindow(
                     new MakePluginPackageWindow(pluginsDirectory.getParentFile()
                         .getParentFile()));
                     new MakePluginPackageWindow(folders.getApplicationFolder(),
                         folders.getPluginsFolder(), folders.getInstallFolder()));
             } catch (Exception e) {
                 log.error("Error creating teh wizard to create an installer ", e);
                 LOG.error("Error creating teh wizard to create an installer ", e);
+            }
+        }
-...
         public void postInitialize() {
             super.postInitialize();
             Version version = ApplicationLocator.getManager().getVersion();
             SwingInstallerLocator.getSwingInstallerManager().setGvSIGVersion(
             SwingInstallerLocator.getSwingInstallerManager().setApplicationVersion(
                 version.getFormat());
+        }

branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/locale/text.properties
1	1	make_plugin_package=Hacer un instalable de un plugin
2	2	make_plugin_package_description=Crea un instalable de un plugin instalado
3		install_package=Ejecutar un instalable
4		install_package_description=Ejecuta un instalable para instalar un nuevo plugin en gvSIG
	3	install_package=Instalar un nuevo paquete
	4	install_package_description=instala un nuevo paquete (plugin, traducciones, tema, etc.) en gvSIG

branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/locale/text_en.properties
1	1	make_plugin_package=Make a plugin installer
2	2	make_plugin_package_description=Create an installer from an installed plugin
3		install_package=Execute an installer
4		install_package_description=Executes an installer to install a new plugin in gvSIG
	3	install_package=Install a new bundle
	4	install_package_description=Installs a new bundle (plugin, translations, theme, etc.) in gvSIG

         private static final long serialVersionUID = -5107758157530922356L;
         private InstallPackageWizard installerExecutionWizard;
         public InstallPackageServiceFrame(File applicationDirectory)
             throws LocatorException, InstallPackageWizardException {
         public InstallPackageServiceFrame(File applicationFolder,
             File pluginsFolder, File installFolder) throws LocatorException,
             InstallPackageWizardException {
             super();
             setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
             installerExecutionWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createInstallPackageWizard(applicationDirectory);
                     .createInstallPackageWizard(applicationFolder, pluginsFolder,
                         installFolder);
             installerExecutionWizard
                 .setWizardActionListener(new FrameWizardListener(this));
             this.add(installerExecutionWizard);

     package org.gvsig.installer.main.execution;
     import java.io.File;
     import java.io.IOException;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
-...
         public InstallPackageWizardFromDefaultDirectoryLauncher()
             throws LocatorException, InstallPackageWizardException,
             InstallPackageServiceException, IOException {
             File applicationDirectory = getApplicationDirectory();
             InstallPackageServiceFrame frame =
                 new InstallPackageServiceFrame(applicationDirectory);
                 new InstallPackageServiceFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.installFromDefaultDirectory();
             frame.setVisible(true);
+        }

     package org.gvsig.installer.main.execution;
     import java.io.File;
     import java.io.IOException;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
-...
         public InstallPackageWizardLauncher() throws LocatorException,
             InstallPackageWizardException, InstallPackageServiceException,
             IOException {
             File applicationDirectory = getApplicationDirectory();
             InstallPackageServiceFrame frame =
                 new InstallPackageServiceFrame(applicationDirectory);
                 new InstallPackageServiceFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.setVisible(true);
+        }
+    }

     package org.gvsig.installer.main.creation;
     import java.io.File;
     import java.io.IOException;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
-...
         public MakePluginPackageWizardLauncher() throws LocatorException,
             MakePluginPackageWizardException, IOException,
             MakePluginPackageServiceException {
             File applicationDirectory = getApplicationDirectory();
             MakePluginPackageFrame frame =
                 new MakePluginPackageFrame(applicationDirectory);
                 new MakePluginPackageFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.setVisible(true);
+        }

         private static final long serialVersionUID = 4144834319158286247L;
         private MakePluginPackageWizard installerCreationWizard;
         public MakePluginPackageFrame(File applicationDirectory)
             throws LocatorException, MakePluginPackageWizardException {
         public MakePluginPackageFrame(File applicationFolder, File pluginsFolder,
             File installFolder) throws LocatorException,
             MakePluginPackageWizardException {
             super();
             setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
             installerCreationWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createMakePluginPackageWizard(applicationDirectory);
                     .createMakePluginPackageWizard(applicationFolder,
                         pluginsFolder, installFolder);
             installerCreationWizard
                 .setWizardActionListener(new FrameWizardListener(this));
             this.add(installerCreationWizard);

      */
     public class DefaultLauncher {
         public File getApplicationDirectory() throws IOException {
             File templateFile =
                 new File(getClass().getClassLoader().getResource("application")
                     .getFile());
             File applicationDirectory =
                 new File(System.getProperty("java.io.tmpdir") + File.separator
                     + "tmp_gvsig_installer");
         private File appFolder;
             copy(templateFile, applicationDirectory);
         public File getApplicationFolder() throws IOException {
             if (appFolder == null) {
                 File templateFile =
                     new File(getClass().getClassLoader().getResource("application")
                         .getFile());
                 appFolder =
                     new File(System.getProperty("java.io.tmpdir") + File.separator
                         + "tmp_gvsig_installer");
             return applicationDirectory;
                 copy(templateFile, appFolder);
+            }
             return appFolder;
+        }
         public File getPluginsFolder() throws IOException {
             return new File(appFolder, "plugins");
+        }
         public File getInstallFolder() throws IOException {
             return new File(appFolder, "install");
+        }
         public void copy(File sourceLocation, File targetLocation)
             throws IOException {
             if (sourceLocation.isDirectory()) {

     import java.io.File;
     import org.gvsig.installer.lib.api.InstallerManager.ARCH;
     import org.gvsig.installer.lib.api.InstallerManager.JVM;
     import org.gvsig.installer.lib.api.InstallerManager.OS;
     import org.gvsig.installer.lib.api.InstallerManager.STATE;
     /**
      * Information of a package that is used on the installation process.
      * This information is composed by next fields:
-...
         /**
          * @return
          *         Gets the state of the package.
          * @see STATE
          */
         public String getState();
         /**
          * Sets the state of the package
+         *
          * @param state
          * @see STATE
          */
         public void setState(String state);
         /**
-...
         public void setType(String type);
         /**
          * Returns the supported operating system.
+         *
          * @return the supported operating system
          * @see OS
          */
         public String getOperatingSystem();
         /**
          * Sets the supported operating system.
+         *
          * @param operatingSystem
          *            the supported operating system
          * @see OS
          */
         public void setOperatingSystem(String operatingSystem);
         /**
          * Returns the supported hardware architecture.
+         *
          * @return the supported hardware architecture
          * @see ARCH
          */
         public String getArchitecture();
         /**
          * Sets the supported hardware architecture.
+         *
          * @param architecture
          *            the supported hardware architecture
          * @see ARCH
          */
         public void setArchitecture(String architecture);
         /**
          * Returns the supported java vm version.
+         *
          * @return the supported java vm version
          * @see JVM
          */
         public String getJavaVM();
         /**
          * Sets the supported java vm version.
+         *
          * @param javaVM
          *            the supported java vm version
          * @see JVM
          */
         public void setJavaVM(String javaVM);
         public String getGvSIGVersion();

     package org.gvsig.installer.lib.api;
     import java.io.File;
     import java.text.MessageFormat;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
-...
      */
     public interface InstallerManager extends Manager {
         /**
          * Package state default values.
          */
         public static interface STATE {
             public static final String DEVEL = "devel";
             public static final String TESTING = "testing";
             public static final String PILOT = "pilot";
             public static final String PROTOTYPE = "prototype";
             public static final String ALPHA = "alpha";
             public static final String BETA = "beta";
             public static final String RC = "RC";
             public static final String FINAL = "final";
             static final String DEVEL = "devel";
             static final String TESTING = "testing";
             static final String PILOT = "pilot";
             static final String PROTOTYPE = "prototype";
             static final String ALPHA = "alpha";
             static final String BETA = "beta";
             static final String RC = "RC";
             static final String FINAL = "final";
+        }
         /**
          * Supported operating system default values.
          */
         public static interface OS {
             public static final String ALL = "all";
             public static final String LINUX = "lin";
             public static final String WINDOWS = "win";
             public static final String OSX_10_4 = "osx_10_4";
             public static final String OSX_10_5 = "osx_10_5";
             public static final String OSX_10_6 = "osx_10_6";
             static final String ALL = "all";
             static final String LINUX = "lin";
             static final String WINDOWS = "win";
             static final String OSX_10_4 = "osx_10_4";
             static final String OSX_10_5 = "osx_10_5";
             static final String OSX_10_6 = "osx_10_6";
+        }
         /**
          * Supported architecture default values.
          */
         public static interface ARCH {
             public static final String ALL = "all";
             public static final String X86 = "x86";
             public static final String X86_64 = "x86_64";
             static final String ALL = "all";
             static final String X86 = "x86";
             static final String X86_64 = "x86_64";
+        }
         /**
          * Supported Java virtual machine version default values.
          */
         public static interface JVM {
             public static final String J1_5 = "j1_5";
             public static final String J1_6 = "j1_6";
             static final String J1_5 = "j1_5";
             static final String J1_6 = "j1_6";
+        }
         /**
          * Fields into the bundle file name message format.
+         *
          * @see InstallerManager#getPackageBundleNameFormat()
          * @see InstallerManager#setPackageBundleNameFormat(String)
          */
         public static interface BUNDLE_FILE_NAME_FIELDS {
             static final int GVSIG_VERSION = 0;
             static final int NAME = 1;
             static final int VERSION = 2;
             static final int BUILD = 3;
             static final int STATE = 4;
             static final int OS = 5;
             static final int ARCH = 6;
             static final int JVM = 7;
+        }
         /**
          * It registers a class that implements the service for the creation of
          * bundle that contains inside a package of type plugin. The registered
          * class
-...
         public MakePluginPackageService getMakePluginPackageService(
             File pluginsDirectory) throws MakePluginPackageServiceException;
         /**
          * Returns a list of package infos for the already installed plugins.
+         *
          * @param pluginsDirectory
          *            where to look for the installed plugins
          * @return the list of package infos for the already installed plugins
          * @throws MakePluginPackageServiceException
          *             if there is an error loading
          *             the information of the installed plugins
          */
         public PackageInfo[] getInstalledPackages(File pluginsDirectory)
             throws MakePluginPackageServiceException;
         /**
          * Returns the package bundle file name format.
          * <p>
          * The string has to use a suitable {@link MessageFormat} format, and the
          * available field numbers are the ones defined in the
          * BUNDLE_FILE_NAME_FIELDS interface.
          * </p>
+         *
          * @return the package bundle file name format.
          */
         public String getPackageBundleNameFormat();
         /**
          * Sets the package bundle file name format.
+         *
          * @see InstallerManager#getPackageBundleNameFormat()
          * @param packageBundleNameFormat
          *            the package bundle file name format.
          */
         public void setPackageBundleNameFormat(String packageBundleNameFormat);
         /**
          * Returns the name of the package bundle file for a given package info.
+         *
          * @param info
          *            of the plugin
          * @return the name of the package bundle file
          */
         public String getPackageBundleFileName(PackageInfo info);
         /**

     package org.gvsig.installer.lib.api.execution;
     import java.io.File;
     import java.net.URI;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
-...
          * @throws InstallPackageServiceException
          *             it is thrown if there is an exception reading the URI.
          */
         public void addBundle(URI bundleURI) throws InstallPackageServiceException;
         public void addBundle(File bundleFile)
             throws InstallPackageServiceException;
         /**
          * In reads a directory and reads all the bundles. This method retrieve
-...
          * selected
          * package has to be contained in one of the bundles that has been
          * previously
          * added using the {@link #addBundle(URI)} or the
          * added using the {@link #addBundle(File)} or the
          * {@link #addBundlesFromDirectory(File)} method.
+         *
          * @param applicationDirectory
-...
          * selected
          * package has to be contained in one of the bundles that has been
          * previously
          * added using the {@link #addBundle(URI)} or the
          * added using the {@link #addBundle(File)} or the
          * {@link #addBundlesFromDirectory(File)} method.
+         *
          * @param applicationDirectory
-...
          * @return
          *         the number of packages that has been loaded form one or more
          *         bundles
          *         using the {@link #addBundle(URI)} or the
          *         using the {@link #addBundle(File)} or the
          *         {@link #addBundlesFromDirectory(File)} method.
          */
         public int getPackageCount();
-...
         /**
          * Return the package information for a concrete position. All
          * the packages has been loaded form one or more bundles
          * using the {@link #addBundle(URI)} or the
          * using the {@link #addBundle(File)} or the
          * {@link #addBundlesFromDirectory(File)} method.
+         *
          * @param index
-...
         /**
          * Return the package information for a concrete position. All
          * the packages has been loaded form one or more bundles
          * using the {@link #addBundle(URI)} or the
          * using the {@link #addBundle(File)} or the
          * {@link #addBundlesFromDirectory(File)} method.
+         *
          * @param packageCode

         public String getDefaultAntScript()
             throws MakePluginPackageServiceException;
         /**
          * Returns the list of packages already installed in the application.
+         *
          * @return the list of packages already installed in the application
          * @throws MakePluginPackageServiceException
          *             if there is an error getting
          *             the installed packages
          */
         public PackageInfo[] getInstalledPackages()
             throws MakePluginPackageServiceException;
+    }

     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.InputStream;
     import java.net.URI;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
-...
      */
     public class DefaultInstallPackageService implements InstallPackageService {
         private Map<PackageInfo, URI> packageInfoUriMap = null;
         private Map<PackageInfo, File> packageInfoFileMap = null;
         private Map<PackageInfo, String> zipEntriesMap = null;
         private List<PackageInfo> packageInfos = null;
         private Manager manager;
-...
         public DefaultInstallPackageService(DefaultInstallerManager manager) {
             super();
             this.manager = manager;
             packageInfoUriMap = new HashMap<PackageInfo, URI>();
             packageInfoFileMap = new HashMap<PackageInfo, File>();
             packageInfos = new ArrayList<PackageInfo>();
             zipEntriesMap = new HashMap<PackageInfo, String>();
             installerProviderServices =
-...
                 throw new InstallPackageServiceException(
                     "application_directory_not_found");
+            }
             if (!packageInfoUriMap.containsKey(packageInfo)) {
             if (!packageInfoFileMap.containsKey(packageInfo)) {
                 throw new InstallPackageServiceException("package_not_found");
+            }
             InputStream bundleStream = null;
             try {
                 File file = new File(packageInfoUriMap.get(packageInfo));
                 File file = packageInfoFileMap.get(packageInfo);
                 bundleStream = new FileInputStream(file);
             } catch (FileNotFoundException e) {
                 throw new InstallPackageServiceException("not_uri_selected");
-...
             return null;
+        }
         public void addBundle(URI inputURI) throws InstallPackageServiceException {
             File file = new File(inputURI);
             if (!file.exists()) {
         public void addBundle(File bundle) throws InstallPackageServiceException {
             if (!bundle.exists()) {
                 throw new InstallPackageServiceException(
                     "Only URI form existing file is supported");
                     "Only an existing file is supported");
+            }
             try {
                 int packageInfoCount = packageInfos.size();
                 installerProviderServices.readPackageInfo(
                     new FileInputStream(file), packageInfos, zipEntriesMap);
                 installerProviderServices.readPackageInfo(new FileInputStream(
                     bundle), packageInfos, zipEntriesMap);
                 for (int i = packageInfoCount; i < packageInfos.size(); i++) {
                     packageInfoUriMap.put(packageInfos.get(i), inputURI);
                     packageInfoFileMap.put(packageInfos.get(i), bundle);
+                }
             } catch (FileNotFoundException e) {
                 logger.error("File not found", e);
-...
+            }
             File[] files = directory.listFiles();
             for (int i = 0; i < files.length; i++) {
                 addBundle(files[i].toURI());
                 if (files[i].isFile()) {
                     addBundle(files[i]);
+                }
+            }
+        }

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/creation/DefaultMakePluginPackageService.java
390	390	public File getPluginsDirectory() {
391	391	return pluginsDirectory;
392	392	}
	393
	394	public PackageInfo[] getInstalledPackages()
	395	throws MakePluginPackageServiceException {
	396	return installerInfos.toArray(new PackageInfo[installerInfos.size()]);
	397	}
393	398	}

         private ExtensionPointManager extensionPoints = ToolsLocator
             .getExtensionPointManager();
         public static final int FIELD_GVSIG_VERSION = 0;
         public static final int FIELD_NAME = 1;
         public static final int FIELD_VERSION = 2;
         public static final int FIELD_BUILD = 3;
         public static final int FIELD_STATE = 4;
         public static final int FIELD_OS = 5;
         public static final int FIELD_ARCH = 6;
         public static final int FIELD_JVM = 7;
         private String packageBundleNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.zip";
-...
         public String getPackageBundleFileName(PackageInfo info) {
             Object[] parameters = new Object[8];
             parameters[FIELD_GVSIG_VERSION] = info.getGvSIGVersion();
             parameters[FIELD_NAME] = info.getCode();
             parameters[FIELD_VERSION] = info.getVersion();
             parameters[FIELD_BUILD] = info.getBuild();
             parameters[FIELD_STATE] = info.getState();
             parameters[FIELD_OS] = info.getOperatingSystem();
             parameters[FIELD_ARCH] = info.getArchitecture();
             parameters[FIELD_JVM] = info.getJavaVM();
             parameters[BUNDLE_FILE_NAME_FIELDS.GVSIG_VERSION] =
                 info.getGvSIGVersion();
             parameters[BUNDLE_FILE_NAME_FIELDS.NAME] = info.getCode();
             parameters[BUNDLE_FILE_NAME_FIELDS.VERSION] = info.getVersion();
             parameters[BUNDLE_FILE_NAME_FIELDS.BUILD] = info.getBuild();
             parameters[BUNDLE_FILE_NAME_FIELDS.STATE] = info.getState();
             parameters[BUNDLE_FILE_NAME_FIELDS.OS] = info.getOperatingSystem();
             parameters[BUNDLE_FILE_NAME_FIELDS.ARCH] = info.getArchitecture();
             parameters[BUNDLE_FILE_NAME_FIELDS.JVM] = info.getJavaVM();
             return MessageFormat.format(getPackageBundleNameFormat(), parameters);
+        }
         public PackageInfo[] getInstalledPackages(File pluginsDirectory)
             throws MakePluginPackageServiceException {
             MakePluginPackageService service =
                 getMakePluginPackageService(pluginsDirectory);
             return service.getInstalledPackages();
+        }
+    }

             InstallPackageService installerExecutionService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
             installerExecutionService.addBundle(externalInstallationFile.toURI());
             installerExecutionService.addBundle(externalInstallationFile);
             PackageInfo packageInfo =
                 installerExecutionService.getPackageInfo("org.gvsig.plugin1");

             InstallPackageService installPackageService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
             installPackageService.addBundle(installerFile.toURI());
             installPackageService.addBundle(installerFile);
             assertEquals(1, installPackageService.getPackageCount());
             PackageInfo newInstallerInfo =
                 makePluginPackageService.getPluginPackageInfo(0);
-...
             // decompress the plugin and read the plugin information
             InstallPackageService installPackageService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
             installPackageService.addBundle(installerFile.toURI());
             installPackageService.addBundle(installerFile);
             assertEquals(1, installPackageService.getPackageCount());
             PackageInfo newInstallerInfo =
                 makePluginPackageService.getPluginPackageInfo(0);
-...
             // decompress the plugin and read the plugin information
             InstallPackageService installPackageService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
             installPackageService.addBundle(installerFile.toURI());
             installPackageService.addBundle(installerFile);
             assertEquals(1, installPackageService.getPackageCount());
             PackageInfo newInstallerInfo =
                 makePluginPackageService.getPluginPackageInfo(0);

     output_options=Opciones de salida
     progress=Progreso de instalaci?n
     advanced_mode=El modo avanzado permite copiar recursos que est?n localizados fuera de el directorio de los plugins. No se recomienda usar esta opci?n.
     initializing=Initializing
     create_output_file_exception=Error creando el fichero de salida
     initializing=Inicializando
     create_output_file_exception=Error creando el archivo de salida
     select_installer=Selecciona el instalador
     select_plugins=Selecciona los plugins a instalar
     execute_adding_error=Error a?adiendo el recurso
-...
     enable_advanced_mode=Habilitar el modo avanzado
     compressing=Comprimiendo
     finished=Terminado
     standard_installation=Instalaci?n esd?ndar
     standard_installation=Instalaci?n est?ndar
     installation_from_file=Instalaci?n desde archivo
     official=Oficial
     not_official=No oficial

     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;
-...
         private WizardListenerAdapter wizardListenerAdapter = null;
         public DefaultInstallPackageWizard(File applicationDirectory)
         public DefaultInstallPackageWizard(File applicationFolder,
             File pluginsFolder, File installFolder)
             throws InstallPackageServiceException {
             super(applicationDirectory);
             super(applicationFolder, pluginsFolder, installFolder);
             installerExecutionService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
             URL iconURL =
                 getClass().getClassLoader().getResource(
                     "images/installpackageicon.png");
-...
             this.setLayout(new BorderLayout());
             this.add(wizardPanelWithLogo, BorderLayout.CENTER);
             installerExecutionService =
                 InstallerLocator.getInstallerManager().getInstallPackageService();
+        }
         private void addWizards() {
-...
         public void installFromDefaultDirectory()
             throws InstallPackageServiceException {
             getWizardComponents().removeWizardPanel(0);
             installerExecutionService
                 .addBundlesFromDirectory(getDefaultInstallersDirectory());
             installerExecutionService.addBundlesFromDirectory(getInstallFolder());
             selectPluginsWizard.updatePanel();
+        }
         public File getDefaultInstallersDirectory() {
             return SwingInstallerLocator.getSwingInstallerManager()
                 .getDefaultInstallersFolder(applicationDirectory);
+        }
         public WizardPanelActionListener getWizardPanelActionListener() {
             if (((wizardListenerAdapter == null) && (getWizardActionListener() != null))) {
                 return new WizardListenerAdapter(this);

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     package org.gvsig.installer.swing.impl.execution.panel;
     import java.awt.Component;
     import java.awt.Font;
     import javax.swing.JTable;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel.TablePackageInfo;
     /**
      * @author gvSIG Team
      * @version $Id$
      */
     public class InstalledPackageCellRenderer extends
         AbstractTablePackageInfoCellRenderer {
         private static final long serialVersionUID = 8084888009827442141L;
         protected Component getTableCellRendererComponent(TablePackageInfo info,
             Component defaultComponent, JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
             if (info.isInstalled()) {
                 defaultComponent.setFont(defaultComponent.getFont().deriveFont(
                     Font.BOLD));
+            }
             return defaultComponent;
+        }
+    }

     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     import org.gvsig.installer.swing.api.SwingInstallerManager;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableCellRenderer;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel;
     /**
-...
             initComponents();
             pluginsTable.getSelectionModel().addListSelectionListener(this);
             pluginsTable.setDefaultRenderer(Boolean.class,
                 new PackagesTableCellRenderer(selectPluginsPanel));
                 new PackageToInstallCellRenderer(selectPluginsPanel));
             AbstractTablePackageInfoCellRenderer ipcr = new InstalledPackageCellRenderer();
             pluginsTable.setDefaultRenderer(String.class, ipcr);
             pluginsTable.setDefaultRenderer(Number.class, ipcr);
             pluginsTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        }
-...
         public boolean isPackageSelected() {
             return ((PackagesTableModel) pluginsTable.getModel())
                 .isPackageSelected();
                 .hasAnyPackageSelected();
+        }
         private void initComponents() {

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     package org.gvsig.installer.swing.impl.execution.panel;
     import java.awt.Component;
     import javax.swing.JTable;
     import javax.swing.table.DefaultTableCellRenderer;
     import javax.swing.table.TableModel;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel.TablePackageInfo;
     /**
      * @author gvSIG Team
      * @version $Id$
      */
     public abstract class AbstractTablePackageInfoCellRenderer extends
         DefaultTableCellRenderer {
         private static final long serialVersionUID = -8534540354786328208L;
         public Component getTableCellRendererComponent(JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
             Component defaultComponent =
                 super.getTableCellRendererComponent(table, value, isSelected,
                     hasFocus, row, column);
             TableModel tableModel = table.getModel();
             if (tableModel instanceof PackagesTableModel) {
                 PackagesTableModel packagesTableModel =
                     (PackagesTableModel) tableModel;
                 TablePackageInfo info = packagesTableModel.getPackageInfo(row);
                 return getTableCellRendererComponent(info, defaultComponent, table,
                     value, isSelected, hasFocus, row, column);
+            }
             return defaultComponent;
+        }
         protected abstract Component getTableCellRendererComponent(
             TablePackageInfo info, Component defaultComponent, JTable table,
             Object value, boolean isSelected, boolean hasFocus, int row, int column);
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2010 {Prodevelop}   {Task}
      */
     package org.gvsig.installer.swing.impl.execution.panel;
     import java.awt.Component;
     import javax.swing.JCheckBox;
     import javax.swing.JLabel;
     import javax.swing.JTable;
     import org.gvsig.installer.swing.impl.execution.model.IPackageSelectionListener;
     import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel.TablePackageInfo;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class PackageToInstallCellRenderer extends
         AbstractTablePackageInfoCellRenderer {
         private static final long serialVersionUID = 5104570009030434792L;
         protected JCheckBox check = new JCheckBox();
         protected JLabel empty = new JLabel();
         private IPackageSelectionListener packagesSelectionListener = null;
         public PackageToInstallCellRenderer(
             IPackageSelectionListener packagesSelectionListener) {
             this.packagesSelectionListener = packagesSelectionListener;
+        }
         protected Component getTableCellRendererComponent(TablePackageInfo info,
             Component defaultComponent, JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
             if (info.isInstallable()) {
                 check.setSelected(((value != null) && ((Boolean) value)
                     .booleanValue()));
                 packagesSelectionListener.packageSelectionchanged(value);
                 return check;
             } else {
                 return empty;
+            }
+        }
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2010 {Prodevelop}   {Task}
      */
     package org.gvsig.installer.swing.impl.execution.model;
     import java.awt.Component;
     import javax.swing.JCheckBox;
     import javax.swing.JTable;
     import javax.swing.table.TableCellRenderer;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class PackagesTableCellRenderer extends JCheckBox implements
         TableCellRenderer {
         /**
+         *
          */
         private static final long serialVersionUID = 5104570009030434792L;
         protected JCheckBox check = new JCheckBox();
         private IPackageSelectionListener packagesSelectionListener = null;
         public PackagesTableCellRenderer(
             IPackageSelectionListener packagesSelectionListener) {
             super();
             this.packagesSelectionListener = packagesSelectionListener;
+        }
         public Component getTableCellRendererComponent(JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
             setSelected(((value != null) && ((Boolean) value).booleanValue()));
             packagesSelectionListener.packageSelectionchanged(value);
             return this;
+        }
+    }

     package org.gvsig.installer.swing.impl.execution.model;
     import java.util.ArrayList;
     import java.io.File;
     import java.util.Comparator;
     import java.util.List;
     import java.util.Set;
     import java.util.TreeSet;
     import javax.swing.event.TableModelListener;
     import javax.swing.table.TableModel;
     import javax.swing.table.AbstractTableModel;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.swing.impl.DefaultSwingInstallerManager;
     import org.gvsig.installer.swing.api.SwingInstallerManager;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class PackagesTableModel implements TableModel {
     public class PackagesTableModel extends AbstractTableModel {
         private DefaultSwingInstallerManager swingInstallerManager = null;
         private List<PackageInfo> installerInfos = null;
         private List<Boolean> selected = null;
         private static final long serialVersionUID = 5953623592122163923L;
         private TablePackageInfo[] installerInfos = null;
         public PackagesTableModel(
             DefaultSwingInstallerManager swingInstallerManager,
             InstallPackageService installerExecutionService, boolean isOfficial) {
             super();
             this.swingInstallerManager = swingInstallerManager;
         private final String[] columnNames;
             installerInfos = new ArrayList<PackageInfo>();
             selected = new ArrayList<Boolean>();
         private InstallerManager installerManager = InstallerLocator
             .getInstallerManager();
         public PackagesTableModel(SwingInstallerManager swingInstallerManager,
             InstallPackageService installerExecutionService, boolean isOfficial,
             File pluginsFolder) {
             Set<TablePackageInfo> infoSet =
                 new TreeSet<TablePackageInfo>(new TablePackageInfoComparator());
             for (int i = 0; i < installerExecutionService.getPackageCount(); i++) {
                 PackageInfo installerInfo =
                     installerExecutionService.getPackageInfo(i);
                 if (installerInfo.isOfficial() == isOfficial) {
                     installerInfos.add(installerInfo);
                     selected.add(false);
                     TablePackageInfo info =
                         new TablePackageInfo(installerInfo, false, true);
                     infoSet.add(info);
+                }
+            }
+        }
             try {
                 PackageInfo[] installedPackages =
                     installerManager.getInstalledPackages(pluginsFolder);
         public void addTableModelListener(TableModelListener l) {
             // TODO Auto-generated method stub
                 for (int i = 0; i < installedPackages.length; i++) {
                     if (installedPackages[i].isOfficial() == isOfficial) {
                         TablePackageInfo info =
                             new TablePackageInfo(installedPackages[i], true, false);
                         infoSet.add(info);
+                    }
+                }
             } catch (MakePluginPackageServiceException e) {
                 throw new RuntimeException(e);
+            }
             installerInfos = infoSet.toArray(new TablePackageInfo[infoSet.size()]);
             columnNames =
                 new String[] {
                     "", // Check column
                     swingInstallerManager.getText("id"),
                     swingInstallerManager.getText("type"),
                     swingInstallerManager.getText("status"),
                     swingInstallerManager.getText("version"),
                     swingInstallerManager.getText("build"),
                     swingInstallerManager.getText("operating_system"),
                     swingInstallerManager.getText("architecture"),
                     swingInstallerManager.getText("java_version"),
                     swingInstallerManager.getText("gvSIG_version") };
+        }
         public Class<?> getColumnClass(int columnIndex) {
-...
+        }
         public int getColumnCount() {
             return 10;
             return columnNames.length;
+        }
         public String getColumnName(int columnIndex) {
             switch (columnIndex) {
             case 0:
                 return swingInstallerManager.getText("");
             case 1:
                 return swingInstallerManager.getText("name");
             case 2:
                 return swingInstallerManager.getText("type");
             case 3:
                 return swingInstallerManager.getText("status");
             case 4:
                 return swingInstallerManager.getText("version");
             case 5:
                 return swingInstallerManager.getText("build");
             case 6:
                 return swingInstallerManager.getText("operating_system");
             case 7:
                 return swingInstallerManager.getText("architecture");
             case 8:
                 return swingInstallerManager.getText("java_version");
             case 9:
                 return swingInstallerManager.getText("gvSIG_version");
             default:
                 return "";
+            }
             return columnIndex >= columnNames.length ? ""
                 : columnNames[columnIndex];
+        }
         public int getRowCount() {
             return installerInfos.size();
             return installerInfos.length;
+        }
         public Object getValueAt(int rowIndex, int columnIndex) {
             PackageInfo installerInfo = installerInfos.get(rowIndex);
             TablePackageInfo tableInfo = installerInfos[rowIndex];
             PackageInfo installerInfo = tableInfo.getPackageInfo();
             switch (columnIndex) {
             case 0:
                 return selected.get(rowIndex);
                 return tableInfo.isSelected();
             case 1:
                 return installerInfo.getName();
                 return installerInfo.getCode();
             case 2:
                 return installerInfo.getType();
             case 3:
-...
+            }
+        }
         private PackageInfo getPackageInfoAt(int rowIndex) {
             return installerInfos[rowIndex].getPackageInfo();
+        }
         public String getDescriptionAt(int rowIndex) {
             return installerInfos.get(rowIndex).getDescription();
             return getPackageInfoAt(rowIndex).getDescription();
+        }
         public boolean isCellEditable(int rowIndex, int columnIndex) {
             if (columnIndex == 0) {
                 return true;
+            }
             return false;
             return (columnIndex == 0) && installerInfos[rowIndex].isInstallable();
+        }
         public void removeTableModelListener(TableModelListener l) {
             // TODO Auto-generated method stub
+        }
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
             selected.remove(rowIndex);
             selected.add(rowIndex, (Boolean) aValue);

Application: gvSIG desktop

Revision 33743