Index: services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
===================================================================
RCS file: /cvs/autoupdate/services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 OperationContainerImpl.java
--- services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java	11 Apr 2007 22:39:12 -0000	1.2
+++ services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java	25 Apr 2007 11:55:08 -0000
@@ -219,7 +219,15 @@
             return Utils.findBrokenDependencies(getUpdateElement());
         }*/
         public Set<String> getBrokenDependencies (){
-            return Utils.getBrokenDependencies (getUpdateElement());
+            List<ModuleInfo> moduleInfos = new ArrayList<ModuleInfo>();
+            for (OperationContainer.OperationInfo oii : listAll ()) {
+                UpdateElementImpl impl = Trampoline.API.impl(oii.getUpdateElement());
+                ModuleInfo info = impl.getModuleInfo();
+                assert info != null : "ModuleInfo for UpdateElement " + oii.getUpdateElement () + " found.";
+                moduleInfos.add(info);
+            }
+            
+            return Utils.getBrokenDependencies (getUpdateElement(), moduleInfos);
         }
     }
     
Index: services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java
===================================================================
RCS file: /cvs/autoupdate/services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java,v
retrieving revision 1.4
diff -u -r1.4 UpdateUnitFactory.java
--- services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java	20 Apr 2007 13:50:17 -0000	1.4
+++ services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java	25 Apr 2007 11:55:08 -0000
@@ -79,7 +79,7 @@
             Exceptions.printStackTrace(iex);
             return new HashMap<String, UpdateUnit>();
         }
-        Map<String, UpdateUnit> temp  = appendUpdateItems (getUpdateUnits(), provider);
+        Map<String, UpdateUnit> temp  = appendUpdateItems (appendInstalldeModules (new HashMap<String, UpdateUnit> ()), provider);
         Map<String, UpdateUnit> retval = new HashMap<String, UpdateUnit>();
         assert items != null;
         for (UpdateItem updateItem : items) {
Index: services/src/org/netbeans/modules/autoupdate/services/Utils.java
===================================================================
RCS file: /cvs/autoupdate/services/src/org/netbeans/modules/autoupdate/services/Utils.java,v
retrieving revision 1.4
diff -u -r1.4 Utils.java
--- services/src/org/netbeans/modules/autoupdate/services/Utils.java	15 Apr 2007 10:03:51 -0000	1.4
+++ services/src/org/netbeans/modules/autoupdate/services/Utils.java	25 Apr 2007 11:55:08 -0000
@@ -200,7 +200,7 @@
         return retval;
     }
     
-    public static Set<Dependency> findBrokenDependencies(UpdateElement element) {
+    public static Set<Dependency> findBrokenDependencies(UpdateElement element, List<ModuleInfo> infos) {
         UpdateElementImpl el = Trampoline.API.impl (element);
         assert el != null : "UpdateElementImpl found for UpdateElement " + element;
         Set<Dependency> retval = Collections.emptySet ();
@@ -215,6 +215,7 @@
         }
         final Set<Dependency> deps = info.getDependencies();
         List<ModuleInfo> extendedModules = getInstalledModules();
+        extendedModules.addAll(infos);
         final Set<Dependency> brokenDeps = DependencyChecker.findBrokenDependencies(deps, extendedModules);
         List<UpdateElement> reqs = findRequiredModules(brokenDeps, extendedModules);
         extendedModules.addAll (getModuleInfos (reqs));
@@ -222,10 +223,10 @@
         return retval;
     }
     
-    static Set<String> getBrokenDependencies (UpdateElement element) {
+    static Set<String> getBrokenDependencies (UpdateElement element, List<ModuleInfo> infos) {
         assert element != null : "UpdateElement cannot be null";
         Set<String> retval = new HashSet<String> ();
-        for (Dependency dep : findBrokenDependencies (element)) {
+        for (Dependency dep : findBrokenDependencies (element, infos)) {
             retval.add (dep.toString ());
         }
         return retval;
Index: services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/org-yourorghere-depending.nbm
===================================================================
RCS file: /cvs/autoupdate/services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/org-yourorghere-depending.nbm,v
retrieving revision 1.2
diff -u -r1.2 org-yourorghere-depending.nbm
Binary files /tmp/cvsd0aiIq and org-yourorghere-depending.nbm differ
Index: ui/src/org/netbeans/modules/autoupdate/ui/Unit.java
===================================================================
RCS file: /cvs/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/Unit.java,v
retrieving revision 1.5
diff -u -r1.5 Unit.java
--- ui/src/org/netbeans/modules/autoupdate/ui/Unit.java	20 Apr 2007 13:14:16 -0000	1.5
+++ ui/src/org/netbeans/modules/autoupdate/ui/Unit.java	25 Apr 2007 11:55:08 -0000
@@ -245,7 +245,7 @@
             this.isNbms = isNbms;
             this.updateUnit = unit;
             // XXX: find highest version
-            this.updateEl = unit.getAvailableUpdates().get(unit.getAvailableUpdates().size()-1);
+            this.updateEl = unit.getAvailableUpdates().get(0);
             assert updateEl != null : "Updateable UpdateUnit " + unit + " has UpdateElement for update.";
         }
 
Index: ui/src/org/netbeans/modules/autoupdate/ui/wizards/OperationDescriptionStep.java
===================================================================
RCS file: /cvs/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/wizards/OperationDescriptionStep.java,v
retrieving revision 1.5
diff -u -r1.5 OperationDescriptionStep.java
--- ui/src/org/netbeans/modules/autoupdate/ui/wizards/OperationDescriptionStep.java	19 Apr 2007 16:00:55 -0000	1.5
+++ ui/src/org/netbeans/modules/autoupdate/ui/wizards/OperationDescriptionStep.java	25 Apr 2007 11:55:08 -0000
@@ -149,8 +149,9 @@
                         if (u.getInstalled () != null) {
                             displayName = u.getInstalled ().getDisplayName ();
                         } else if (u.getAvailableUpdates ().size () > 0) {
-                            displayName = u.getAvailableUpdates ().get (0).getDisplayName ();
+                            displayName = u.getAvailableUpdates ().get (0).getDisplayName ();                            
                         }
+                        break;
                     }
                 }
             }