Revision 32517

View differences:

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.main/src/main/java/org/gvsig/installer/main/execution/InstallerExecutionFrame.java
54 54
	public void setApplicationDirectory(File applicationDirectory) throws InstallerExecutionServiceException{
55 55
		installerExecutionWizard.setApplicationDirectory(applicationDirectory);
56 56
	}	
57
	
58
	public void installFromDefaultDirectory() throws InstallerExecutionServiceException{
59
		installerExecutionWizard.installFromDefaultDirectory();
60
	}	
61
	
62
	
57 63
}
branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.main/src/test/java/org/gvsig/installer/main/execution/InstallerExecutionWizardFromDefaultDirectoryLauncher.java
1
/* gvSIG. Geographic Information System of the Valencian Government
2
*
3
* Copyright (C) 2007-2008 Infrastructures and Transports Department
4
* of the Valencian Government (CIT)
5
* 
6
* This program is free software; you can redistribute it and/or
7
* modify it under the terms of the GNU General Public License
8
* as published by the Free Software Foundation; either version 2
9
* of the License, or (at your option) any later version.
10
* 
11
* This program is distributed in the hope that it will be useful,
12
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
* GNU General Public License for more details.
15
* 
16
* You should have received a copy of the GNU General Public License
17
* along with this program; if not, write to the Free Software
18
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
19
* MA  02110-1301, USA.
20
* 
21
*/
22

  
23
/*
24
* AUTHORS (In addition to CIT):
25
* 2010 {Prodevelop}   {Task}
26
*/
27
 
28
package org.gvsig.installer.main.execution;
29

  
30
import java.io.File;
31
import java.io.IOException;
32

  
33
import org.gvsig.installer.lib.api.execution.InstallerExecutionServiceException;
34
import org.gvsig.installer.main.DefaultLauncher;
35
import org.gvsig.installer.main.MainInstallerLibrary;
36
import org.gvsig.installer.swing.api.execution.CreateInstallerExecutionWizardException;
37
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
38
import org.gvsig.tools.locator.LocatorException;
39

  
40
/**
41
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
42
 */
43
public class InstallerExecutionWizardFromDefaultDirectoryLauncher extends DefaultLauncher{
44
	
45
	public static void main(String[] args) throws LocatorException, InstallerExecutionServiceException, CreateInstallerExecutionWizardException, IOException{		
46
		new DefaultLibrariesInitializer().fullInitialize();
47
		MainInstallerLibrary mainInstallerLibrary = new MainInstallerLibrary();
48
		mainInstallerLibrary.initialize();
49
		mainInstallerLibrary.postInitialize();
50
		
51
		new InstallerExecutionWizardFromDefaultDirectoryLauncher();
52
	}
53
	
54
	public InstallerExecutionWizardFromDefaultDirectoryLauncher() throws LocatorException, CreateInstallerExecutionWizardException, InstallerExecutionServiceException, IOException{
55
		File applicationDirectory = getApplicationDirectory();	
56
		
57
		InstallerExecutionFrame frame = new InstallerExecutionFrame();		
58
		frame.setApplicationDirectory(applicationDirectory);
59
		frame.installFromDefaultDirectory();
60
		frame.setVisible(true);		
61
	}
62
}
63

  
0 64

  
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/execution/DefaultInstallerExecutionWizard.java
59 59
	private InstallerExecutionService installerExecutionService = null;
60 60
	private File applicationDirectory = null;
61 61
	private static final Logger logger = LoggerFactory.getLogger(DefaultInstallerExecutionWizard.class);
62
	private List<InstallerInfo> installersToInstall = null;
63

  
62
	private List<InstallerInfo> installersToInstall = null;	
63
		
64 64
	//Wizards
65 65
	private SelectInstallersWizard selectInstallersWizard = null;
66 66
	private SelectPluginsWizard selectPluginsWizard = null;
......
85 85
	private void addWizards(){
86 86
		getWizardComponents().addWizardPanel(
87 87
				new InstallerWizardContainer(getWizardComponents(), 
88
						selectInstallersWizard));	
88
					selectInstallersWizard));
89
		
89 90
		getWizardComponents().addWizardPanel(
90 91
				new InstallerWizardContainer(getWizardComponents(), 
91 92
						selectPluginsWizard));	
......
134 135
	public void setNextButtonEnabled(boolean isEnabled){
135 136
		getWizardComponents().getNextButton().setEnabled(isEnabled);
136 137
	}
138

  
139
	@Override
140
	public void installFromDefaultDirectory() throws InstallerExecutionServiceException {
141
		getWizardComponents().removeWizardPanel(0);
142
		installerExecutionService.addInstallersFromInstallDirectory();
143
		selectPluginsWizard.updatePanel();
144
	}
137 145
}
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/execution/InstallerExecutionWizard.java
55 55
	 * If the directory doesn't exist or if is an invalid gvSIG directory
56 56
	 */
57 57
	public abstract void setApplicationDirectory(File applicationDirectory) throws InstallerExecutionServiceException;
58
	
59
	/**
60
	 * If this method is selected the first window of the wizard is
61
	 * not visible and the installation process takes the installers
62
	 * form the default directory.
63
	 * @throws InstallerExecutionServiceException 
64
	 */
65
	public abstract void installFromDefaultDirectory() throws InstallerExecutionServiceException;
58 66
}
59 67

  

Also available in: Unified diff