Revision 37409 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/wizard/SelectPackagesWizard.java

View differences:

SelectPackagesWizard.java
36 36
import org.gvsig.gui.beans.wizard.WizardPanelWithLogo;
37 37
import org.gvsig.gui.beans.wizard.panel.NotContinueWizardException;
38 38
import org.gvsig.gui.beans.wizard.panel.OptionPanel;
39
import org.gvsig.installer.lib.api.Dependencies;
39 40
import org.gvsig.installer.lib.api.DependenciesCalculator;
40 41
import org.gvsig.installer.lib.api.PackageInfo;
41 42
import org.gvsig.installer.lib.api.execution.InstallPackageService;
42 43
import org.gvsig.installer.swing.api.execution.JShowPackageStatusAndAskContinuePanel;
43 44
import org.gvsig.installer.swing.api.execution.JShowRequiredPackagesAndAskContinuePanel;
45
import org.gvsig.installer.swing.api.execution.JShowUnresolvedDependenciesAndAskContinuePanel;
44 46
import org.gvsig.installer.swing.impl.execution.DefaultInstallPackageWizard;
45 47
import org.gvsig.installer.swing.impl.execution.model.PackagesTableModel;
46 48
import org.gvsig.installer.swing.impl.execution.panel.SelectPackagesPanel;
......
95 97

  
96 98
    private void checkDependencies() throws NotContinueWizardException {
97 99
        List<PackageInfo> requiredPackages = null;
100
        Dependencies unresolvedDependencies = null;
98 101
        try {
99 102
            // Creamos el calculador de dependencias
100 103
            DependenciesCalculator calculator =
......
119 122
            calculator.calculate();
120 123

  
121 124
            requiredPackages = calculator.getRequiredPackages();
125
            unresolvedDependencies = calculator.getUnresolvedDependencies();
122 126
        } catch (Throwable e) {
123 127
            LOG
124 128
                .error(
......
154 158
                }
155 159
            }
156 160
        }
161
        
162
        if (unresolvedDependencies != null && unresolvedDependencies.size() > 0) {
163
        	JShowUnresolvedDependenciesAndAskContinuePanel dlg =
164
        		this.swingInstallerManager
165
        		.createJShowUnresolvedDependenciesAndAskContinuePanel(
166
        				unresolvedDependencies,
167
        		"Las siguientes dependencias no se han podido resolver\n?Desea Continuar de todas formas?");
168
        	if (dlg.needShow()) {
169
        		WindowManager wm = ToolsSwingLocator.getWindowManager();
170
        		wm.showWindow(dlg, "? Desea continuar ?",
171
        				WindowManager.MODE.DIALOG);
172
        		if (dlg.cancelled()) {
173
        			throw new NotContinueWizardException("", null, false);
174
        		}
175
        	}
176
        }
177
        
157 178
        Iterator<PackageInfo> it = requiredPackages.iterator();
158 179
        while (it.hasNext()) {
159 180
            selectPackage(it.next());

Also available in: Unified diff