You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/05/26 20:54:14 UTC
svn commit: r660271 - in /felix/sandbox/clement/obr-utils/obr-checker: ./
bundles/checker-bundle.jar checker.jar
src/org/apache/felix/ipojo/obr/checker/Report.java
Author: clement
Date: Mon May 26 11:54:11 2008
New Revision: 660271
URL: http://svn.apache.org/viewvc?rev=660271&view=rev
Log:
Improve the issue message in the generated report to list every unsatisfied requirements (instead of just the first one)
Modified:
felix/sandbox/clement/obr-utils/obr-checker/ (props changed)
felix/sandbox/clement/obr-utils/obr-checker/bundles/checker-bundle.jar
felix/sandbox/clement/obr-utils/obr-checker/checker.jar
felix/sandbox/clement/obr-utils/obr-checker/src/org/apache/felix/ipojo/obr/checker/Report.java
Propchange: felix/sandbox/clement/obr-utils/obr-checker/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 26 11:54:11 2008
@@ -0,0 +1,9 @@
+target
+.classpath
+.project
+.checkstyle
+.settings
+bin
+output
+*.html
+cache
Modified: felix/sandbox/clement/obr-utils/obr-checker/bundles/checker-bundle.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/obr-utils/obr-checker/bundles/checker-bundle.jar?rev=660271&r1=660270&r2=660271&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/clement/obr-utils/obr-checker/checker.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/obr-utils/obr-checker/checker.jar?rev=660271&r1=660270&r2=660271&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/sandbox/clement/obr-utils/obr-checker/src/org/apache/felix/ipojo/obr/checker/Report.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/obr-utils/obr-checker/src/org/apache/felix/ipojo/obr/checker/Report.java?rev=660271&r1=660270&r2=660271&view=diff
==============================================================================
--- felix/sandbox/clement/obr-utils/obr-checker/src/org/apache/felix/ipojo/obr/checker/Report.java (original)
+++ felix/sandbox/clement/obr-utils/obr-checker/src/org/apache/felix/ipojo/obr/checker/Report.java Mon May 26 11:54:11 2008
@@ -36,7 +36,7 @@
private boolean isUnresolved;
private boolean asFailedOnStartup;
private Throwable exception;
- private Requirement[] unsatisfiedRequirement;
+ private Requirement[] unsatisfiedRequirements;
}
private List<Repository> repositories;
@@ -73,7 +73,7 @@
Result result = new Result();
result.resource = res;
result.isUnresolved = true;
- result.unsatisfiedRequirement = reqs;
+ result.unsatisfiedRequirements = reqs;
unresolved.add(result);
all.add(result);
}
@@ -150,11 +150,11 @@
String message = " OK ";
if (res.isUnresolved) {
status = "yellow";
- for (int j = 0; j < res.unsatisfiedRequirement.length; j++) {
- if (message.length() == 0) {
- message = "Missing " + res.unsatisfiedRequirement[j].getName() + " - " + res.unsatisfiedRequirement[j].getFilter();
+ for (int j = 0; j < res.unsatisfiedRequirements.length; j++) {
+ if (message.equals(" OK ")) {
+ message = "Missing " + res.unsatisfiedRequirements[j].getName() + " - " + res.unsatisfiedRequirements[j].getFilter();
} else {
- message = "<br/> Missing " + res.unsatisfiedRequirement[j].getName() + " - " + res.unsatisfiedRequirement[j].getFilter();
+ message += "<br/> Missing " + res.unsatisfiedRequirements[j].getName() + " - " + res.unsatisfiedRequirements[j].getFilter();
}
}
} else if (res.asFailedOnStartup) {