This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 102426
Collapse All | Expand All

(-)services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java (-1 / +9 lines)
Lines 219-225 Link Here
219
            return Utils.findBrokenDependencies(getUpdateElement());
219
            return Utils.findBrokenDependencies(getUpdateElement());
220
        }*/
220
        }*/
221
        public Set<String> getBrokenDependencies (){
221
        public Set<String> getBrokenDependencies (){
222
            return Utils.getBrokenDependencies (getUpdateElement());
222
            List<ModuleInfo> moduleInfos = new ArrayList<ModuleInfo>();
223
            for (OperationContainer.OperationInfo oii : listAll ()) {
224
                UpdateElementImpl impl = Trampoline.API.impl(oii.getUpdateElement());
225
                ModuleInfo info = impl.getModuleInfo();
226
                assert info != null : "ModuleInfo for UpdateElement " + oii.getUpdateElement () + " found.";
227
                moduleInfos.add(info);
228
            }
229
            
230
            return Utils.getBrokenDependencies (getUpdateElement(), moduleInfos);
223
        }
231
        }
224
    }
232
    }
225
    
233
    
(-)services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java (-1 / +1 lines)
Lines 79-85 Link Here
79
            Exceptions.printStackTrace(iex);
79
            Exceptions.printStackTrace(iex);
80
            return new HashMap<String, UpdateUnit>();
80
            return new HashMap<String, UpdateUnit>();
81
        }
81
        }
82
        Map<String, UpdateUnit> temp  = appendUpdateItems (getUpdateUnits(), provider);
82
        Map<String, UpdateUnit> temp  = appendUpdateItems (appendInstalldeModules (new HashMap<String, UpdateUnit> ()), provider);
83
        Map<String, UpdateUnit> retval = new HashMap<String, UpdateUnit>();
83
        Map<String, UpdateUnit> retval = new HashMap<String, UpdateUnit>();
84
        assert items != null;
84
        assert items != null;
85
        for (UpdateItem updateItem : items) {
85
        for (UpdateItem updateItem : items) {
(-)services/src/org/netbeans/modules/autoupdate/services/Utils.java (-3 / +4 lines)
Lines 200-206 Link Here
200
        return retval;
200
        return retval;
201
    }
201
    }
202
    
202
    
203
    public static Set<Dependency> findBrokenDependencies(UpdateElement element) {
203
    public static Set<Dependency> findBrokenDependencies(UpdateElement element, List<ModuleInfo> infos) {
204
        UpdateElementImpl el = Trampoline.API.impl (element);
204
        UpdateElementImpl el = Trampoline.API.impl (element);
205
        assert el != null : "UpdateElementImpl found for UpdateElement " + element;
205
        assert el != null : "UpdateElementImpl found for UpdateElement " + element;
206
        Set<Dependency> retval = Collections.emptySet ();
206
        Set<Dependency> retval = Collections.emptySet ();
Lines 215-220 Link Here
215
        }
215
        }
216
        final Set<Dependency> deps = info.getDependencies();
216
        final Set<Dependency> deps = info.getDependencies();
217
        List<ModuleInfo> extendedModules = getInstalledModules();
217
        List<ModuleInfo> extendedModules = getInstalledModules();
218
        extendedModules.addAll(infos);
218
        final Set<Dependency> brokenDeps = DependencyChecker.findBrokenDependencies(deps, extendedModules);
219
        final Set<Dependency> brokenDeps = DependencyChecker.findBrokenDependencies(deps, extendedModules);
219
        List<UpdateElement> reqs = findRequiredModules(brokenDeps, extendedModules);
220
        List<UpdateElement> reqs = findRequiredModules(brokenDeps, extendedModules);
220
        extendedModules.addAll (getModuleInfos (reqs));
221
        extendedModules.addAll (getModuleInfos (reqs));
Lines 222-231 Link Here
222
        return retval;
223
        return retval;
223
    }
224
    }
224
    
225
    
225
    static Set<String> getBrokenDependencies (UpdateElement element) {
226
    static Set<String> getBrokenDependencies (UpdateElement element, List<ModuleInfo> infos) {
226
        assert element != null : "UpdateElement cannot be null";
227
        assert element != null : "UpdateElement cannot be null";
227
        Set<String> retval = new HashSet<String> ();
228
        Set<String> retval = new HashSet<String> ();
228
        for (Dependency dep : findBrokenDependencies (element)) {
229
        for (Dependency dep : findBrokenDependencies (element, infos)) {
229
            retval.add (dep.toString ());
230
            retval.add (dep.toString ());
230
        }
231
        }
231
        return retval;
232
        return retval;
(-)ui/src/org/netbeans/modules/autoupdate/ui/Unit.java (-1 / +1 lines)
Lines 245-251 Link Here
245
            this.isNbms = isNbms;
245
            this.isNbms = isNbms;
246
            this.updateUnit = unit;
246
            this.updateUnit = unit;
247
            // XXX: find highest version
247
            // XXX: find highest version
248
            this.updateEl = unit.getAvailableUpdates().get(unit.getAvailableUpdates().size()-1);
248
            this.updateEl = unit.getAvailableUpdates().get(0);
249
            assert updateEl != null : "Updateable UpdateUnit " + unit + " has UpdateElement for update.";
249
            assert updateEl != null : "Updateable UpdateUnit " + unit + " has UpdateElement for update.";
250
        }
250
        }
251
251
(-)ui/src/org/netbeans/modules/autoupdate/ui/wizards/OperationDescriptionStep.java (-1 / +2 lines)
Lines 149-156 Link Here
149
                        if (u.getInstalled () != null) {
149
                        if (u.getInstalled () != null) {
150
                            displayName = u.getInstalled ().getDisplayName ();
150
                            displayName = u.getInstalled ().getDisplayName ();
151
                        } else if (u.getAvailableUpdates ().size () > 0) {
151
                        } else if (u.getAvailableUpdates ().size () > 0) {
152
                            displayName = u.getAvailableUpdates ().get (0).getDisplayName ();
152
                            displayName = u.getAvailableUpdates ().get (0).getDisplayName ();                            
153
                        }
153
                        }
154
                        break;
154
                    }
155
                    }
155
                }
156
                }
156
            }
157
            }

Return to bug 102426