/ - Diff - | gvSIG desktop 1 - gvSIG

      */
     package org.gvsig.app.extension;
     import java.io.File;
     import java.util.StringTokenizer;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.andami.Launcher;
     import org.gvsig.andami.PluginsLocator;
     import org.gvsig.app.ApplicationLocator;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * gvSIG application version information.
-...
         public Version() {
             String[] versions = new String[] { "2", "0", "0" };
             try {
             	File pluginsFolder = PluginsLocator.getManager().getPluginsFolder().getAbsoluteFile();
                 MakePluginPackageService packageService =
                     InstallerLocator.getInstallerManager()
                         .getMakePluginPackageService(pluginsFolder);
                         .getMakePluginPackageService();
                 PackageInfo info =
                     packageService.getPluginPackageInfo(APP_PACKAGE_CODE);

     package org.gvsig.installer.app.extension.execution;
     import java.io.BufferedReader;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.InputStreamReader;
     import java.net.MalformedURLException;
-...
     			.getLogger(InstallPackageExtension.class);
     	public void execute(String actionCommand) {
     		// int resp = JOptionPane.showConfirmDialog(
     		// null,
     		// Messages.getText("install_package_extension_warning"),
     		// Messages.getText("select_an_option"),
     		// JOptionPane.YES_NO_OPTION);
     		// if (resp!=JOptionPane.OK_OPTION){
     		// return;
     		// }
     		PluginsManager manager = PluginsLocator.getManager();
     		try {
     			PluginServices.getMDIManager().addCentredWindow(
     					new InstallPackageWindow(manager.getApplicationFolder(),
     							manager.getPluginsFolder().getAbsoluteFile(),
     							manager.getInstallFolder()));
     		} catch (Error e) {
     			LOG.error("Error creating the wizard to install a package ", e);

      */
     public class InstallPackageWindow extends JPanel implements IWindow {
         private static final long serialVersionUID = 4719868181091291809L;
         WindowInfo windowInfo = null;
     	private static final long serialVersionUID = 4719868181091291809L;
     	WindowInfo windowInfo = null;
         public InstallPackageWindow(File applicationFolder, File pluginsFolder,
             File installFolder) throws LocatorException,
             InstallPackageWizardException {
             super();
             AbstractInstallPackageWizard installPackageWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createInstallPackageWizard(applicationFolder, pluginsFolder,
                         installFolder);
             installPackageWizard
                 .setWizardActionListener(new WindowInstallerListener(this));
             this.setLayout(new BorderLayout());
             add(installPackageWizard, BorderLayout.CENTER);
+        }
     	public InstallPackageWindow(File applicationFolder, File installFolder)
     			throws LocatorException, InstallPackageWizardException {
     		super();
     		AbstractInstallPackageWizard installPackageWizard = SwingInstallerLocator
     				.getSwingInstallerManager().createInstallPackageWizard(
     						applicationFolder, installFolder);
     		installPackageWizard
     				.setWizardActionListener(new WindowInstallerListener(this));
     		this.setLayout(new BorderLayout());
     		add(installPackageWizard, BorderLayout.CENTER);
+    	}
         public WindowInfo getWindowInfo() {
             if (windowInfo == null) {
                 windowInfo =
                     new WindowInfo(WindowInfo.MODELESSDIALOG
                         | WindowInfo.ICONIFIABLE | WindowInfo.RESIZABLE);
                 Dimension dim = getPreferredSize();
                 windowInfo.setWidth((int) dim.getWidth());
                 windowInfo.setHeight((int) dim.getHeight());
                 windowInfo.setTitle(Messages.getText("install_package"));
+            }
             return windowInfo;
+        }
     	public WindowInfo getWindowInfo() {
     		if (windowInfo == null) {
     			windowInfo = new WindowInfo(WindowInfo.MODELESSDIALOG
     					| WindowInfo.ICONIFIABLE | WindowInfo.RESIZABLE);
     			Dimension dim = getPreferredSize();
     			windowInfo.setWidth((int) dim.getWidth());
     			windowInfo.setHeight((int) dim.getHeight());
     			windowInfo.setTitle(Messages.getText("install_package"));
+    		}
     		return windowInfo;
+    	}
         public Object getWindowProfile() {
             return WindowInfo.DIALOG_PROFILE;
+        }
     	public Object getWindowProfile() {
     		return WindowInfo.DIALOG_PROFILE;
+    	}
+    }

      */
     public class MakePluginPackageExtension extends Extension {
         private static final Logger LOG = LoggerFactory
             .getLogger(MakePluginPackageExtension.class);
     	private static final Logger LOG = LoggerFactory
     			.getLogger(MakePluginPackageExtension.class);
         public void execute(String actionCommand) {
             PluginsManager manager = PluginsLocator.getManager();
     	public void execute(String actionCommand) {
     		PluginsManager manager = PluginsLocator.getManager();
             try {
                 PluginServices.getMDIManager().addCentredWindow(
                     new MakePluginPackageWindow(manager.getApplicationFolder(),
                         manager.getPluginsFolder().getAbsoluteFile(), manager
                             .getInstallFolder()));
             } catch (Exception e) {
                 LOG.error("Error creating teh wizard to create an installer ", e);
+            }
+        }
     		try {
     			PluginServices.getMDIManager().addCentredWindow(
     					new MakePluginPackageWindow(manager.getApplicationFolder(),
     							manager.getInstallFolder()));
     		} catch (Exception e) {
     			LOG.error("Error creating teh wizard to create an installer ", e);
+    		}
+    	}
         public void initialize() {
     	public void initialize() {
+        }
+    	}
         @Override
         public void postInitialize() {
             super.postInitialize();
             Version version = ApplicationLocator.getManager().getVersion();
             SwingInstallerLocator.getSwingInstallerManager().setApplicationVersion(
                 version.getFormat());
+        }
     	@Override
     	public void postInitialize() {
     		super.postInitialize();
     		Version version = ApplicationLocator.getManager().getVersion();
     		SwingInstallerLocator.getSwingInstallerManager().setApplicationVersion(
     				version.getFormat());
+    	}
         public boolean isEnabled() {
             return true;
+        }
     	public boolean isEnabled() {
     		return true;
+    	}
         public boolean isVisible() {
             return true;
+        }
     	public boolean isVisible() {
     		return true;
+    	}
+    }

      */
     public class MakePluginPackageWindow extends JPanel implements IWindow {
         private static final long serialVersionUID = 3423389124323013058L;
         WindowInfo windowInfo = null;
     	private static final long serialVersionUID = 3423389124323013058L;
     	WindowInfo windowInfo = null;
         public MakePluginPackageWindow(File applicationFolder, File pluginsFolder,
             File installFolder) throws LocatorException,
             MakePluginPackageWizardException {
             super();
             MakePluginPackageWizard makePluginPackageWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createMakePluginPackageWizard(applicationFolder,
                         pluginsFolder, installFolder);
             makePluginPackageWizard
                 .setWizardActionListener(new WindowInstallerListener(this));
             this.setLayout(new BorderLayout());
             add(makePluginPackageWizard, BorderLayout.CENTER);
+        }
     	public MakePluginPackageWindow(File applicationFolder, File installFolder)
     			throws LocatorException, MakePluginPackageWizardException {
     		super();
     		MakePluginPackageWizard makePluginPackageWizard = SwingInstallerLocator
     				.getSwingInstallerManager().createMakePluginPackageWizard(
     						applicationFolder, installFolder);
     		makePluginPackageWizard
     				.setWizardActionListener(new WindowInstallerListener(this));
     		this.setLayout(new BorderLayout());
     		add(makePluginPackageWizard, BorderLayout.CENTER);
+    	}
         public WindowInfo getWindowInfo() {
             if (windowInfo == null) {
                 windowInfo =
                     new WindowInfo(WindowInfo.MODELESSDIALOG
                         | WindowInfo.ICONIFIABLE | WindowInfo.RESIZABLE);
                 Dimension dim = getPreferredSize();
                 windowInfo.setWidth((int) dim.getWidth());
                 windowInfo.setHeight((int) dim.getHeight());
                 windowInfo.setTitle(Messages.getText("make_plugin_package"));
+            }
             return windowInfo;
+        }
     	public WindowInfo getWindowInfo() {
     		if (windowInfo == null) {
     			windowInfo = new WindowInfo(WindowInfo.MODELESSDIALOG
     					| WindowInfo.ICONIFIABLE | WindowInfo.RESIZABLE);
     			Dimension dim = getPreferredSize();
     			windowInfo.setWidth((int) dim.getWidth());
     			windowInfo.setHeight((int) dim.getHeight());
     			windowInfo.setTitle(Messages.getText("make_plugin_package"));
+    		}
     		return windowInfo;
+    	}
         public Object getWindowProfile() {
             return WindowInfo.DIALOG_PROFILE;
+        }
     	public Object getWindowProfile() {
     		return WindowInfo.DIALOG_PROFILE;
+    	}
+    }

      */
     public class WindowInstallerListener implements InstallerWizardActionListener {
         private IWindow window = null;
     	private IWindow window = null;
         public WindowInstallerListener(IWindow window) {
             super();
             this.window = window;
+        }
     	public WindowInstallerListener(IWindow window) {
     		super();
     		this.window = window;
+    	}
         public void closeWizard() {
             PluginServices.getMDIManager().closeWindow(window);
+        }
     	public void closeWizard() {
     		PluginServices.getMDIManager().closeWindow(window);
+    	}
         public void cancel(InstallerWizardPanel installerWizard) {
             PluginServices.getMDIManager().closeWindow(window);
+        }
     	public void cancel(InstallerWizardPanel installerWizard) {
     		PluginServices.getMDIManager().closeWindow(window);
+    	}
         public void finish(InstallerWizardPanel installerWizard) {
             PluginServices.getMDIManager().closeWindow(window);
+        }
     	public void finish(InstallerWizardPanel installerWizard) {
     		PluginServices.getMDIManager().closeWindow(window);
+    	}
+    }

      */
     public class InstallPackageWizardLauncher extends DefaultLauncher {
         public static void main(String[] args) throws LocatorException,
             InstallPackageServiceException, InstallPackageWizardException,
             IOException {
             new DefaultLibrariesInitializer().fullInitialize();
             new InstallPackageWizardLauncher();
+        }
     	public static void main(String[] args) throws LocatorException,
     			InstallPackageServiceException, InstallPackageWizardException,
     			IOException {
     		new DefaultLibrariesInitializer().fullInitialize();
     		new InstallPackageWizardLauncher();
+    	}
         public InstallPackageWizardLauncher() throws LocatorException,
             InstallPackageWizardException, InstallPackageServiceException,
             IOException {
     	public InstallPackageWizardLauncher() throws LocatorException,
     			InstallPackageWizardException, InstallPackageServiceException,
     			IOException {
             InstallPackageServiceFrame frame =
                 new InstallPackageServiceFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.setVisible(true);
+        }
     		InstallPackageServiceFrame frame = new InstallPackageServiceFrame(
     				getApplicationFolder(), getInstallFolder());
     		frame.setVisible(true);
+    	}
+    }

      */
     public class InstallPackageServiceFrame extends JFrame {
         private static final long serialVersionUID = -5107758157530922356L;
         private AbstractInstallPackageWizard installerExecutionWizard;
     	private static final long serialVersionUID = -5107758157530922356L;
     	private AbstractInstallPackageWizard installerExecutionWizard;
         public InstallPackageServiceFrame(File applicationFolder,
             File pluginsFolder, File installFolder) throws LocatorException,
             InstallPackageWizardException {
             super();
             setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
             installerExecutionWizard =
                 SwingInstallerLocator.getSwingInstallerManager()
                     .createInstallPackageWizard(applicationFolder, pluginsFolder,
                         installFolder);
             installerExecutionWizard
                 .setWizardActionListener(new FrameWizardListener(this));
             this.add(installerExecutionWizard);
             pack();
+        }
     	public InstallPackageServiceFrame(File applicationFolder, File installFolder)
     			throws LocatorException, InstallPackageWizardException {
     		super();
     		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     		installerExecutionWizard = SwingInstallerLocator
     				.getSwingInstallerManager().createInstallPackageWizard(
     						applicationFolder, installFolder);
     		installerExecutionWizard
     				.setWizardActionListener(new FrameWizardListener(this));
     		this.add(installerExecutionWizard);
     		pack();
+    	}
         public void installFromDefaultDirectory()
             throws InstallPackageServiceException {
             installerExecutionWizard.installFromDefaultDirectory();
+        }
     	public void installFromDefaultDirectory()
     			throws InstallPackageServiceException {
     		installerExecutionWizard.installFromDefaultDirectory();
+    	}
+    }

      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallPackageWizardFromDefaultDirectoryLauncher extends
         DefaultLauncher {
     		DefaultLauncher {
         public static void main(String[] args) throws LocatorException,
             InstallPackageServiceException, InstallPackageWizardException,
             IOException {
             new DefaultLibrariesInitializer().fullInitialize();
             new InstallPackageWizardFromDefaultDirectoryLauncher();
+        }
     	public static void main(String[] args) throws LocatorException,
     			InstallPackageServiceException, InstallPackageWizardException,
     			IOException {
     		new DefaultLibrariesInitializer().fullInitialize();
     		new InstallPackageWizardFromDefaultDirectoryLauncher();
+    	}
         public InstallPackageWizardFromDefaultDirectoryLauncher()
             throws LocatorException, InstallPackageWizardException,
             InstallPackageServiceException, IOException {
     	public InstallPackageWizardFromDefaultDirectoryLauncher()
     			throws LocatorException, InstallPackageWizardException,
     			InstallPackageServiceException, IOException {
             InstallPackageServiceFrame frame =
                 new InstallPackageServiceFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.installFromDefaultDirectory();
             frame.setVisible(true);
+        }
     		InstallPackageServiceFrame frame = new InstallPackageServiceFrame(
     				getApplicationFolder(), getInstallFolder());
     		frame.installFromDefaultDirectory();
     		frame.setVisible(true);
+    	}
+    }

      */
     public class MakePluginPackageWizardLauncher extends DefaultLauncher {
         public static void main(String[] args) throws LocatorException,
             MakePluginPackageWizardException, IOException,
             MakePluginPackageServiceException {
             new DefaultLibrariesInitializer().fullInitialize();
             new MakePluginPackageWizardLauncher();
+        }
     	public static void main(String[] args) throws LocatorException,
     			MakePluginPackageWizardException, IOException,
     			MakePluginPackageServiceException {
     		new DefaultLibrariesInitializer().fullInitialize();
     		new MakePluginPackageWizardLauncher();
+    	}
         public MakePluginPackageWizardLauncher() throws LocatorException,
             MakePluginPackageWizardException, IOException,
             MakePluginPackageServiceException {
     	public MakePluginPackageWizardLauncher() throws LocatorException,
     			MakePluginPackageWizardException, IOException,
     			MakePluginPackageServiceException {
             MakePluginPackageFrame frame =
                 new MakePluginPackageFrame(getApplicationFolder(),
                     getPluginsFolder(), getInstallFolder());
             frame.setVisible(true);
+        }
     		MakePluginPackageFrame frame = new MakePluginPackageFrame(
     				getApplicationFolder(), getInstallFolder());
     		frame.setVisible(true);
+    	}
+    }

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

      */
     public class DefaultLauncher {
         private File appFolder;
     	private File appFolder;
         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");
     	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");
                 copy(templateFile, appFolder);
+            }
     			copy(templateFile, appFolder);
+    		}
             return appFolder;
+        }
     		return appFolder;
+    	}
         public File getPluginsFolder() throws IOException {
             return new File(appFolder, "plugins");
+        }
     	public File getPluginsFolder() throws IOException {
     		return new File(appFolder, "plugins");
+    	}
         public File getInstallFolder() throws IOException {
             return new File(appFolder, "install");
+        }
     	public File getInstallFolder() throws IOException {
     		return new File(appFolder, "install");
+    	}
         public void copy(File sourceLocation, File targetLocation)
             throws IOException {
             if (sourceLocation.isDirectory()) {
                 if (!targetLocation.exists()) {
                     targetLocation.mkdir();
+                }
     	public void copy(File sourceLocation, File targetLocation)
     			throws IOException {
     		if (sourceLocation.isDirectory()) {
     			if (!targetLocation.exists()) {
     				targetLocation.mkdir();
+    			}
                 String[] children = sourceLocation.list();
                 for (int i = 0; i < children.length; i++) {
                     copy(new File(sourceLocation, children[i]), new File(
                         targetLocation, children[i]));
+                }
             } else {
                 targetLocation.getParentFile().mkdirs();
     			String[] children = sourceLocation.list();
     			for (int i = 0; i < children.length; i++) {
     				copy(new File(sourceLocation, children[i]), new File(
     						targetLocation, children[i]));
+    			}
     		} else {
     			targetLocation.getParentFile().mkdirs();
                 InputStream in = new FileInputStream(sourceLocation);
                 OutputStream out = new FileOutputStream(targetLocation);
     			InputStream in = new FileInputStream(sourceLocation);
     			OutputStream out = new FileOutputStream(targetLocation);
                 // Copy the bits from instream to outstream
                 byte[] buf = new byte[1024];
                 int len;
                 while ((len = in.read(buf)) > 0) {
                     out.write(buf, 0, len);
+                }
                 in.close();
                 out.close();
+            }
+        }
     			// Copy the bits from instream to outstream
     			byte[] buf = new byte[1024];
     			int len;
     			while ((len = in.read(buf)) > 0) {
     				out.write(buf, 0, len);
+    			}
     			in.close();
     			out.close();
+    		}
+    	}
+    }

      */
     public class FrameWizardListener implements InstallerWizardActionListener {
         private JFrame frame = null;
     	private JFrame frame = null;
         public FrameWizardListener(JFrame frame) {
             super();
             this.frame = frame;
+        }
     	public FrameWizardListener(JFrame frame) {
     		super();
     		this.frame = frame;
+    	}
         public void cancel(InstallerWizardPanel installerWizard) {
             frame.setVisible(false);
             System.exit(0);
     	public void cancel(InstallerWizardPanel installerWizard) {
     		frame.setVisible(false);
     		System.exit(0);
+        }
+    	}
         public void finish(InstallerWizardPanel installerWizard) {
             frame.setVisible(false);
             System.exit(0);
+        }
     	public void finish(InstallerWizardPanel installerWizard) {
     		frame.setVisible(false);
     		System.exit(0);
+    	}
+    }

      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class CreateBoundleFrame extends JFrame implements WindowListener,
         ActionListener {
     		ActionListener {
         /**
     	/**
+         *
          */
         private static final long serialVersionUID = -2128261599641241144L;
         private javax.swing.JButton executeButton;
         private javax.swing.JLabel inputLabel;
         private FileTextField inputText;
         private javax.swing.JLabel jLabel2;
         private FileTextField outputText;
     	private static final long serialVersionUID = -2128261599641241144L;
     	private javax.swing.JButton executeButton;
     	private javax.swing.JLabel inputLabel;
     	private FileTextField inputText;
     	private javax.swing.JLabel jLabel2;
     	private FileTextField outputText;
         public CreateBoundleFrame() throws HeadlessException {
             super();
             initializeComponents();
             this.addWindowListener(this);
             executeButton.addActionListener(this);
+        }
     	public CreateBoundleFrame() throws HeadlessException {
     		super();
     		initializeComponents();
     		this.addWindowListener(this);
     		executeButton.addActionListener(this);
+    	}
         private void initializeComponents() {
             java.awt.GridBagConstraints gridBagConstraints;
     	private void initializeComponents() {
     		java.awt.GridBagConstraints gridBagConstraints;
             inputLabel = new javax.swing.JLabel();
             executeButton = new javax.swing.JButton();
             inputText = new FileTextField();
             outputText = new FileTextField();
             jLabel2 = new javax.swing.JLabel();
     		inputLabel = new javax.swing.JLabel();
     		executeButton = new javax.swing.JButton();
     		inputText = new FileTextField();
     		outputText = new FileTextField();
     		jLabel2 = new javax.swing.JLabel();
             setLayout(new java.awt.GridBagLayout());
     		setLayout(new java.awt.GridBagLayout());
             inputLabel.setText("Input directory");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 0;
             gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(inputLabel, gridBagConstraints);
     		inputLabel.setText("Input directory");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 0;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(inputLabel, gridBagConstraints);
             executeButton.setText("Execute");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 2;
             gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(executeButton, gridBagConstraints);
     		executeButton.setText("Execute");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 2;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(executeButton, gridBagConstraints);
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 0;
             gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
             gridBagConstraints.ipadx = 67;
             gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(inputText, gridBagConstraints);
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 0;
     		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.ipadx = 67;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(inputText, gridBagConstraints);
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 1;
             gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
             gridBagConstraints.ipadx = 67;
             gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(outputText, gridBagConstraints);
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.ipadx = 67;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(outputText, gridBagConstraints);
             jLabel2.setText("Output");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 1;
             gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(jLabel2, gridBagConstraints);
     		jLabel2.setText("Output");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(jLabel2, gridBagConstraints);
+        }
+    	}
         public void windowActivated(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowActivated(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void windowClosed(WindowEvent arg0) {
             System.exit(0);
     	public void windowClosed(WindowEvent arg0) {
     		System.exit(0);
+        }
+    	}
         public void windowClosing(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowClosing(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void windowDeactivated(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowDeactivated(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void windowDeiconified(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowDeiconified(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void windowIconified(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowIconified(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void windowOpened(WindowEvent arg0) {
             // TODO Auto-generated method stub
     	public void windowOpened(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+        }
+    	}
         public void actionPerformed(ActionEvent arg0) {
             File inputDirectory = inputText.getSelectedFile();
             File outputFile = outputText.getSelectedFile();
     	public void actionPerformed(ActionEvent arg0) {
     		File inputDirectory = inputText.getSelectedFile();
     		File outputFile = outputText.getSelectedFile();
             if (!inputDirectory.exists()) {
                 JOptionPane
                     .showMessageDialog(this, "Input directory doesn't exist");
                 return;
+            }
     		if (!inputDirectory.exists()) {
     			JOptionPane
     					.showMessageDialog(this, "Input directory doesn't exist");
     			return;
+    		}
             if (outputFile.exists()) {
                 outputFile.delete();
+            }
     		if (outputFile.exists()) {
     			outputFile.delete();
+    		}
             Compress compress = new Compress();
             try {
                 File[] files = inputDirectory.listFiles();
                 List<File> filesArray = new ArrayList<File>();
                 List<String> fileNamesArray = new ArrayList<String>();
                 for (int i = 0; i < files.length; i++) {
                     if (!files[i].getName().toUpperCase().equals(".SVN")) {
                         filesArray.add(files[i]);
                         fileNamesArray.add(files[i].getName());
+                    }
+                }
                 compress.compressPluginsAsPackageSet(filesArray, fileNamesArray,
                     new FileOutputStream(outputFile));
             } catch (Exception e) {
                 JOptionPane.showMessageDialog(this, e.toString());
+            }
+        }
     		Compress compress = new Compress();
     		try {
     			File[] files = inputDirectory.listFiles();
     			List<File> filesArray = new ArrayList<File>();
     			List<String> fileNamesArray = new ArrayList<String>();
     			for (int i = 0; i < files.length; i++) {
     				if (!files[i].getName().toUpperCase().equals(".SVN")) {
     					filesArray.add(files[i]);
     					fileNamesArray.add(files[i].getName());
+    				}
+    			}
     			compress.compressPluginsAsPackageSet(filesArray, fileNamesArray,
     					new FileOutputStream(outputFile));
     		} catch (Exception e) {
     			JOptionPane.showMessageDialog(this, e.toString());
+    		}
+    	}
+    }

      */
     public class CreateBundleLauncher {
         public static void main(String[] args) {
             new CreateBundleLauncher();
+        }
     	public static void main(String[] args) {
     		new CreateBundleLauncher();
+    	}
         public CreateBundleLauncher() {
             super();
             CreateBoundleFrame createBoundleFrame = new CreateBoundleFrame();
             createBoundleFrame.setBounds(0, 0, 500, 150);
             createBoundleFrame.setVisible(true);
+        }
     	public CreateBundleLauncher() {
     		super();
     		CreateBoundleFrame createBoundleFrame = new CreateBoundleFrame();
     		createBoundleFrame.setBounds(0, 0, 500, 150);
     		createBoundleFrame.setVisible(true);
+    	}
+    }

     public interface MakePluginPackageService extends Service {
     	/**
     	 * @return the directory when the gvSIG plugins are located.
     	 */
     	public File getPluginsDirectory();
     	/**
     	 * It creates a package set with a single plugin package inside.
+    	 *
     	 * @param packageInfo
-...
     	 * the ant build file and the additional external files to be included in
     	 * the package.
+    	 *
     	 * @param packageInfo
     	 *            the information of the plugin that has to be included in the
     	 *            package
     	 * @param newPackageInfo
     	 *            the information of the new plugin.
     	 * @param originalPackageInfo
     	 *            the information of the original plugin.
     	 * @throws MakePluginPackageServiceException
     	 *             it is thrown when there is an exception preparing the package
     	 */
     	public void preparePackage(PackageInfo packageInfo)
     	public void preparePackage(PackageInfo packageInfo,
     			File originalPackageFolder)
     			throws MakePluginPackageServiceException;
     	/**

     	 *            the package owner
     	 */
     	public void setOwner(String owner);
     	/**
     	 * Returns the owner's url {@link URL}.
+    	 *

     import java.io.File;
     import java.net.URL;
     import java.text.MessageFormat;
     import java.util.List;
     import org.gvsig.installer.lib.api.creation.MakePackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
-...
     	public void registerMakePluginPackageService(
     			Class<? extends MakePluginPackageService> clazz);
     	// /**
     	// * It creates and returns an object that is used to create a bundle that
     	// * contains inside a package of type plugin. All the parameters are set
     	// * using the {@link MakePluginPackageService} interface. *
     	// *
     	// * @return an object that is used to create a plugin installer
     	// * @throws MakePluginPackageServiceException
     	// * when there is a problem creating the service
     	// */
     	// public MakePluginPackageService getMakePluginPackageService(
     	// File pluginsDirectory) throws MakePluginPackageServiceException;
     	/**
     	 * It creates and returns an object that is used to create a bundle that
     	 * contains inside a package of type plugin. All the parameters are set
-...
+    	 *
     	 * @return an object that is used to create a plugin installer
     	 * @throws MakePluginPackageServiceException
     	 * @throws MakePluginPackageServiceException
     	 *             when there is a problem creating the service
     	 */
     	public MakePluginPackageService getMakePluginPackageService(
     			File pluginsDirectory) throws MakePluginPackageServiceException;
     	public MakePluginPackageService getMakePluginPackageService()
     			throws MakePluginPackageServiceException;
     	/**
     	 * Returns a list of package infos for the already installed plugins.
-...
     			throws MakePluginPackageServiceException;
     	/**
     	 * Returns a list of package infos for the already 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()
     			throws MakePluginPackageServiceException;
     	/**
     	 * Returns the package bundle file name format.
     	 * <p>
     	 * The string has to use a suitable {@link MessageFormat} format, and the
-...
     	public String getVersion();
     	/**
     	 * Gets a List of all the folders where there might be addons folders
     	 * (addons repositories).
+    	 *
     	 * @return list of repositories paths
     	 */
     	public List<File> getAddonRepositories();
     	/**
     	 * Adds an addon repository path to the manager list.
+    	 *
     	 * @param path
     	 *            of the repository
     	 */
     	public void addAddonRepository(File path);
     	/**
     	 * Gets a List of all the addon folders. An addon folder is a folder inside
     	 * any addon repository with a package.info file inside. (addons
     	 * repositories).
+    	 *
     	 * @return list of addon paths folders.
     	 */
     	public List<File> getAddonFolders();
     	/**
     	 * Gets the folder of the addon with the code provided, or null if not
     	 * found.
+    	 *
     	 * @param code
     	 *            of the addon
+    	 *
     	 * @return File of the folder of the addon.
     	 */
     	public File getAddonFolder(String code);
     	public void setDefaultAddonRepository(File defaultAddonsRepository);
     	public File getDefaultAddonRepository();
+    }

     	private void writePackageInfoFile(File directory, String fileName,
     			PackageInfo installerInfo) throws InstallerInfoFileException {
     		if (!directory.exists()) {
     			throw new InstallerInfoFileException("The directory doesn't exist");
     			// throw new
     			// InstallerInfoFileException("The directory doesn't exist");
     			directory.mkdir();
+    		}
     		InstallerInfoFileWriter installerInfoFileWriter = new InstallerInfoFileWriter();
     		installerInfoFileWriter.write(installerInfo, directory + File.separator

     import java.net.URL;
     import java.net.URLConnection;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
-...
     import org.gvsig.installer.lib.spi.InstallPackageProviderServices;
     import org.gvsig.installer.lib.spi.InstallerProviderLocator;
     import org.gvsig.tools.service.Manager;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
-...
     	public static final String ANT_FILE_NAME = "install.xml";
     	public static final String COPIED_FILES_DIRECTORY_NAME = "files";
     	private File pluginsDirectory;
     	private static final Logger logger = org.slf4j.LoggerFactory
     			.getLogger(DefaultMakePluginPackageService.class);
     	private final InstallerManager manager;
     	private File tempDir;
     	private List<PackageInfo> installerInfos = null;
     	private Map<PackageInfo, String> directories = null;
     	protected String antScript = null;
     	private InstallPackageProviderServices installerProviderServices = null;
     	public DefaultMakePluginPackageService(InstallerManager manager,
     			File pluginsDirectory) throws MakePluginPackageServiceException {
     	public DefaultMakePluginPackageService(InstallerManager manager)
     			throws MakePluginPackageServiceException {
     		super();
     		this.manager = manager;
     		installerInfos = new ArrayList<PackageInfo>();
     		directories = new HashMap<PackageInfo, String>();
     		installerProviderServices = InstallerProviderLocator
     		this.installerInfos = new ArrayList<PackageInfo>();
     		this.installerProviderServices = InstallerProviderLocator
     				.getProviderManager().createInstallerProviderServices();
     		initialize(pluginsDirectory);
     		initialize();
+    	}
     	private void initialize(File pluginsDirectory)
     			throws MakePluginPackageServiceException {
     		if (!pluginsDirectory.exists()) {
     			pluginsDirectory.mkdirs();
     			LOG.info("Plugins folder created: {}", pluginsDirectory);
     		} else if (!pluginsDirectory.isDirectory()) {
     	private void initialize() throws MakePluginPackageServiceException {
     		List<File> addonFolders = manager.getAddonFolders();
     		if (addonFolders == null) {
     			throw new MakePluginPackageServiceException(
     					"The plugins directory exists and not is a directory");
     					"The addonFolders list is null");
+    		}
     		// else if (addonFolders.size() <= 0) {
     		// LOG.info("The addonFolders list is empty");
     		// }
     		else {
     			// Read all the installed plugins
     			for (int i = 0; i < addonFolders.size(); i++) {
     				File pluginDirectoryFile = addonFolders.get(i);
     		this.pluginsDirectory = pluginsDirectory;
     				if (!pluginDirectoryFile.exists()) {
     					pluginDirectoryFile.mkdirs();
     					LOG.info("Plugins folder created: {}", pluginDirectoryFile);
+    				}
     		// Read all the installed plugins
     		String[] plugins = pluginsDirectory.list();
     		if (plugins != null) {
     			for (int i = 0; i < plugins.length; i++) {
     				String pluginDirectoryName = plugins[i];
     				File pluginDirectoryFile = getAbsolutePluginPackageDirectory(pluginDirectoryName);
     				DefaultPackageInfo packageInfo = new DefaultPackageInfo();
     				installerProviderServices.readPackageInfo(new File(
-...
+    				}
     				installerInfos.add(packageInfo);
     				directories.put(packageInfo, pluginDirectoryName);
+    			}
+    		}
+    	}
-...
     					filesDirectory.getAbsolutePath().length(),
     					file.getAbsolutePath().length());
     			// Adding the root directory
     			File pluginFile = new File(pluginsDirectory.getParentFile()
     					.getParentFile().getAbsolutePath()
     			File pluginFile = new File(System.getProperty("user.dir")
     					+ pluginFileName);
     			packageInfo.getFilesToCopy().add(pluginFile);
-...
     				packageStream);
+    	}
     	public void preparePackage(PackageInfo packageInfo)
     	public void preparePackage(PackageInfo packageInfo, File originalPluginDir)
     			throws MakePluginPackageServiceException {
     		LOG.debug("Preparing a package set of the package info: \n{0}",
     				packageInfo);
     		tempDir = new File(manager.getDefaultAddonRepository()
     				.getAbsolutePath()
     				+ File.separator + "temp");
     		File destinationPluginDir = new File(tempDir.getAbsolutePath()
     				+ File.separator + packageInfo.getCode());
     		// TODO: create copy of original plugin?
     		try {
     			copy(originalPluginDir, destinationPluginDir);
     		} catch (IOException e) {
     			throw new MakePluginPackageServiceException(
     					"Exception copying the files", e);
+    		}
     		// Write the package.info file
     		writePackageInfo(packageInfo);
     		writePackageInfo(packageInfo, new File(tempDir.getAbsolutePath()
     				+ File.separator + packageInfo.getCode()));
     		if (packageInfo.getAntScript() != null) {
     			// Create the ant file
-...
     			throws MakePluginPackageServiceException {
     		LOG.debug("Creating package of the package info: \n{0}", packageInfo);
     		installerProviderServices.compressPackage(
     				getAbsolutePluginPackageDirectory(packageInfo), packageStream);
     		// installerProviderServices.compressPackage(
     		// getAbsolutePluginPackageDirectory(packageInfo), packageStream);
     		File pluginPackagePath = new File(tempDir.getAbsolutePath()
     				+ File.separator + packageInfo.getCode());
     		installerProviderServices.compressPackage(pluginPackagePath,
     				packageStream);
     		// TODO: delete dir? si code diferente? si modificado?
     		deleteDir(tempDir);
+    	}
     	public void createPackageIndex(PackageInfo packageInfo,
-...
     	private void writePackageInfo(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		// conseguir directorio destino
     		writePackageInfo(packageInfo,
     				getAbsolutePluginPackageDirectory(packageInfo));
+    	}
-...
     			// It works if the plugins directory is in the folder
     			// "gvSIG/extensiones"
     			String applicationDirectory = pluginsDirectory.getParentFile()
     					.getParent();
     			String applicationDirectory = System.getProperty("user.dir");
     			List<File> files = packageInfo.getFilesToCopy();
-...
     		return (path.delete());
+    	}
     	void copy(File sourceLocation, File targetLocation) throws IOException {
     	private void copy(File sourceLocation, File targetLocation)
     			throws IOException {
     		if (sourceLocation.isDirectory()) {
     			if (!targetLocation.exists()) {
     				targetLocation.mkdir();
-...
+    		}
+    	}
     	private String getPluginPackageDirectory(PackageInfo packageInfo) {
     		return directories.get(packageInfo);
+    	}
     	// private String getCopiedFilesDirectoryName(PackageInfo packageInfo)
     	// throws MakePluginPackageServiceException {
     	// return getPluginPackageDirectory(packageInfo) + File.separator +
     	// "install" + File.separator
     	// + COPIED_FILES_DIRECTORY_NAME;
     	// }
     	private File getCopiedFilesDirectory(File pluginDirectory)
     			throws MakePluginPackageServiceException {
     		return new File(pluginDirectory.getAbsolutePath() + File.separator
-...
     				+ COPIED_FILES_DIRECTORY_NAME;
+    	}
     	private String getAntFileName(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		return getPluginPackageDirectory(packageInfo) + File.separator
     				+ "install" + File.separator + ANT_FILE_NAME;
+    	}
     	private File getAntFile(File pluginDirectory)
     			throws MakePluginPackageServiceException {
     		return new File(pluginDirectory.getAbsolutePath() + File.separator
-...
     	private File getAbsoluteAntFile(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		return new File(pluginsDirectory.getAbsolutePath() + File.separator
     				+ getAntFileName(packageInfo));
     		String destinationFilePath = manager.getDefaultAddonRepository()
     				.getAbsolutePath()
     				+ File.separator + packageInfo.getCode();
     		return new File(destinationFilePath + File.separator + ANT_FILE_NAME);
+    	}
     	private File getAbsolutePluginPackageDirectory(PackageInfo packageInfo)
     			throws MakePluginPackageServiceException {
     		return new File(pluginsDirectory.getAbsolutePath() + File.separator
     				+ getPluginPackageDirectory(packageInfo));
     		String destinationFilePath = manager.getDefaultAddonRepository()
     				.getAbsolutePath()
     				+ File.separator + packageInfo.getCode();
     		return new File(destinationFilePath);
+    	}
     	private File getAbsolutePluginPackageDirectory(String pluginDirectory)
     			throws MakePluginPackageServiceException {
     		return new File(pluginsDirectory.getAbsolutePath() + File.separator
     				+ pluginDirectory);
+    	}
     	public Manager getManager() {
     		return this.manager;
+    	}
-...
     		return fileData.toString();
+    	}
     	public File getPluginsDirectory() {
     		return pluginsDirectory;
+    	}
     	public PackageInfo[] getInstalledPackages()
     			throws MakePluginPackageServiceException {
     		return installerInfos.toArray(new PackageInfo[installerInfos.size()]);

+    			}
     			URL ownerURL = installInfo.getOwnerURL();
     			if (ownerURL != null) {
     				properties.setProperty(InstallerInfoTags.OWNER_URL,
     						ownerURL.toString());
     				properties.setProperty(InstallerInfoTags.OWNER_URL, ownerURL
     						.toString());
+    			}
     			properties.setProperty(InstallerInfoTags.MODEL_VERSION, installInfo
     					.getModelVersion());

     		} else {
     			installerInfoResource.setWebURL(null);
+    		}
     		String ownerURLStr = properties.getProperty(InstallerInfoTags.OWNER_URL);
     		String ownerURLStr = properties
     				.getProperty(InstallerInfoTags.OWNER_URL);
     		if (ownerURLStr != null && !ownerURLStr.equals("")) {
     			URL ownerUrl;
     			try {
-...
     		String categories = properties
     				.getProperty(InstallerInfoTags.CATEGORIES);
     		if (categories != null) {
     		if (categories != null && !categories.equals("")) {
     			installerInfoResource.addCategoriesAsString(categories);
+    		}

     import java.io.File;
     import java.net.URL;
     import java.text.MessageFormat;
     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.installer.lib.api.DependenciesCalculator;
     import org.gvsig.installer.lib.api.Dependency;
-...
     			.getExtensionPointManager();
     	private String packageSetNameFormat = "gvSIG-desktop-{0}-{1}-{2}-{4}-{5}-{6}-{7}.gvspks";
     	private String packageNameFormat = "gvSIG-desktop-{0}-{1}-{2}-{4}-{5}-{6}-{7}.gvspkg";
     	private String packageIndexNameFormat = "gvSIG-desktop-{0}-{1}-{2}-{4}-{5}-{6}-{7}.gvspki";
     	private URL BaseDownloadURL = null;
     	private String version = null;
     	private List<File> repositoriesPathsList = null;
     	private File defaultAddonRepository = null;
     	public DefaultInstallerManager() {
     		super(new DefaultInstallerProviderManager());
     		repositoriesPathsList = new ArrayList<File>();
+    	}
     	public String getPackageSetNameFormat() {
-...
     		this.packageIndexNameFormat = packageIndexNameFormat;
+    	}
     	public MakePluginPackageService getMakePluginPackageService(
     			File pluginsDirectory) throws MakePluginPackageServiceException {
     	// public MakePluginPackageService getMakePluginPackageService(
     	// File pluginsDirectory) throws MakePluginPackageServiceException {
     	// ExtensionPoint ep = extensionPoints
     	// .add(INSTALLER_MANAGER_EXTENSION_POINT);
     	// try {
     	// Object[] args = new Object[] { this, pluginsDirectory };
     	// return (MakePluginPackageService) ep.create(
     	// INSTALLER_CREATION_SERVICE_NAME, args);
     	// } catch (Exception e) {
     	// throw new MakePluginPackageServiceException(
     	// "Exception creating the installer service to create installers",

| gvSIG desktop 1

Revision 37822