Revision 33743 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/DefaultInstallPackageWizard.java

View differences:

DefaultInstallPackageWizard.java
44 44
import org.gvsig.installer.lib.api.PackageInfo;
45 45
import org.gvsig.installer.lib.api.execution.InstallPackageService;
46 46
import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
47
import org.gvsig.installer.swing.api.SwingInstallerLocator;
48 47
import org.gvsig.installer.swing.api.execution.InstallPackageWizard;
49 48
import org.gvsig.installer.swing.impl.execution.wizard.ProgressWizard;
50 49
import org.gvsig.installer.swing.impl.execution.wizard.SelectBundlesWizard;
......
69 68

  
70 69
    private WizardListenerAdapter wizardListenerAdapter = null;
71 70

  
72
    public DefaultInstallPackageWizard(File applicationDirectory)
71
    public DefaultInstallPackageWizard(File applicationFolder,
72
        File pluginsFolder, File installFolder)
73 73
        throws InstallPackageServiceException {
74
        super(applicationDirectory);
74
        super(applicationFolder, pluginsFolder, installFolder);
75

  
76
        installerExecutionService =
77
            InstallerLocator.getInstallerManager().getInstallPackageService();
78

  
75 79
        URL iconURL =
76 80
            getClass().getClassLoader().getResource(
77 81
                "images/installpackageicon.png");
......
93 97

  
94 98
        this.setLayout(new BorderLayout());
95 99
        this.add(wizardPanelWithLogo, BorderLayout.CENTER);
96

  
97
        installerExecutionService =
98
            InstallerLocator.getInstallerManager().getInstallPackageService();
99 100
    }
100 101

  
101 102
    private void addWizards() {
......
138 139
    public void installFromDefaultDirectory()
139 140
        throws InstallPackageServiceException {
140 141
        getWizardComponents().removeWizardPanel(0);
141
        installerExecutionService
142
            .addBundlesFromDirectory(getDefaultInstallersDirectory());
142
        installerExecutionService.addBundlesFromDirectory(getInstallFolder());
143 143
        selectPluginsWizard.updatePanel();
144 144
    }
145 145

  
146
    public File getDefaultInstallersDirectory() {
147
        return SwingInstallerLocator.getSwingInstallerManager()
148
            .getDefaultInstallersFolder(applicationDirectory);
149
    }
150

  
151 146
    public WizardPanelActionListener getWizardPanelActionListener() {
152 147
        if (((wizardListenerAdapter == null) && (getWizardActionListener() != null))) {
153 148
            return new WizardListenerAdapter(this);

Also available in: Unified diff