Not started required modules error message should not include modules

dkayiwa · dkayiwa · commit b598f281edf6 · 2013-05-31T16:45:35.000+03:00
that are already started - TRUNK-3999
diff --git a/api/src/main/java/org/openmrs/module/ModuleFactory.java b/api/src/main/java/org/openmrs/module/ModuleFactory.java
@@ -347,8 +347,21 @@ public int compare(Module left, Module right) {
 	private static List<String> getMissingRequiredModules(Module module) {
 		List<String> ret = new ArrayList<String>();
 		for (String moduleName : module.getRequiredModules()) {
-			String moduleVersion = module.getRequiredModuleVersion(moduleName);
-			ret.add(moduleName + (moduleVersion != null ? " " + moduleVersion : ""));
+			boolean started = false;
+			for (Module mod : getStartedModules()) {
+				if (mod.getPackageName().equals(moduleName)) {
+					String reqVersion = module.getRequiredModuleVersion(moduleName);
+					if (reqVersion == null || ModuleUtil.compareVersion(mod.getVersion(), reqVersion) >= 0) {
+						started = true;
+					}
+					break;
+				}
+			}
+			
+			if (!started) {
+				String moduleVersion = module.getRequiredModuleVersion(moduleName);
+				ret.add(moduleName + (moduleVersion != null ? " " + moduleVersion : ""));
+			}
 		}
 		return ret;
 	}
