Revision 38439

View differences:

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/DefaultInstallerManager.java
264 264 
	}
265 265 

  		




  266
  266
  
    
	public Version createVersion() {


  		




  267
  
  
    
		return new DefaultVersion();


  		




  
  267
  
    
		return version == null ? new DefaultVersion() : new DefaultVersion()


  		




  
  268
  
    
				.parse(version);


  		




  268
  269
  
    
	}


  		




  269
  270
  
    

  		




  270
  271
  
    
	public PackageInfoReader getDefaultPackageInfoReader() {


  		












  

    
      branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.api/src/main/java/org/gvsig/installer/swing/api/SwingInstallerManager.java
    
  





  28
  28
  
    
package org.gvsig.installer.swing.api;


  		




  29
  29
  
    

  		




  30
  30
  
    
import java.io.File;


  		




  
  31
  
    
import java.net.MalformedURLException;


  		




  31
  32
  
    
import java.net.URL;


  		




  32
  33
  
    
import java.util.List;


  		




  33
  34
  
    

  		




  ......




  162
  163
  
    

  		




  163
  164
  
    
	public void addDefaultDownloadURL(URL url);


  		




  164
  165
  
    

  		




  
  166
  
    
	public void addDefaultDownloadURL(String url) throws MalformedURLException;


  		




  
  167
  
    

  		




  165
  168
  
    
	public List<URL> getDefaultDownloadURLs();


  		




  166
  169
  
    
}


  		












  

    
      branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/DefaultSwingInstallerManager.java
    
  





  44
  44
  
    
import org.gvsig.installer.lib.api.InstallerLocator;


  		




  45
  45
  
    
import org.gvsig.installer.lib.api.InstallerManager;


  		




  46
  46
  
    
import org.gvsig.installer.lib.api.PackageInfo;


  		




  
  47
  
    
import org.gvsig.installer.lib.api.Version;


  		




  47
  48
  
    
import org.gvsig.installer.swing.api.JProgressPanel;


  		




  48
  49
  
    
import org.gvsig.installer.swing.api.SwingInstallerManager;


  		




  
  50
  
    
import org.gvsig.installer.swing.api.creation.JOutputPanel;


  		




  
  51
  
    
import org.gvsig.installer.swing.api.creation.JPackageInfoPanel;


  		




  49
  52
  
    
import org.gvsig.installer.swing.api.creation.MakePluginPackageWizard;


  		




  50
  53
  
    
import org.gvsig.installer.swing.api.creation.MakePluginPackageWizardException;


  		




  51
  
  
    
import org.gvsig.installer.swing.api.creation.JOutputPanel;


  		




  52
  
  
    
import org.gvsig.installer.swing.api.creation.JPackageInfoPanel;


  		




  53
  54
  
    
import org.gvsig.installer.swing.api.execution.AbstractInstallPackageWizard;


  		




  54
  55
  
    
import org.gvsig.installer.swing.api.execution.InstallPackageWizardException;


  		




  55
  56
  
    
import org.gvsig.installer.swing.api.execution.JShowPackageStatusAndAskContinuePanel;


  		




  ......




  144
  145
  
    
		try {


  		




  145
  146
  
    
			for (line = in.readLine(); line != null; line = in.readLine()) {


  		




  146
  147
  
    
				try {


  		




  147
  
  
    
					this.addDefaultDownloadURL(new URL(line));


  		




  
  148
  
    
					this.addDefaultDownloadURL(line);


  		




  148
  149
  
    
				} catch (MalformedURLException e) {


  		




  149
  150
  
    
					logger.error(


  		




  150
  151
  
    
							"Error creating the default packages download URL pointing to "


  		




  ......




  160
  161
  
    
	public void addDefaultDownloadURL(URL url) {


  		




  161
  162
  
    
		this.defaultDownloadURLs.add(url);


  		




  162
  163
  
    
	}


  		




  
  164
  
    
	


  		




  
  165
  
    
	public void addDefaultDownloadURL(String url) throws MalformedURLException {


  		




  
  166
  
    
		Version version = getInstallerManager().createVersion();


  		




  
  167
  
    
		String versionFormat = version.getMayor() + "." + version.getMinor()


  		




  
  168
  
    
				+ "." + version.getRevision();


  		




  
  169
  
    
		url = url.replace("$version", versionFormat);


  		




  
  170
  
    
		url = url.replace("<%Version%>", versionFormat);


  		




  
  171
  
    
		url = url.replace("$build", Integer.toString(version.getBuild()));


  		




  
  172
  
    
		url = url.replace("<%Build%>", Integer.toString(version.getBuild()));


  		




  
  173
  
    
		addDefaultDownloadURL(new URL(url));


  		




  
  174
  
    
	}


  		




  163
  175
  
    

  		




  164
  176
  
    
	public List<URL> getDefaultDownloadURLs() {


  		




  165
  177
  
    
		return this.defaultDownloadURLs;


  		












Also available in:  Unified diff