Sync bndlib code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1381708 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/reporter/ReporterAdapter.java b/bundleplugin/src/main/java/aQute/libg/reporter/ReporterAdapter.java
index d233631..8c3f68b 100644
--- a/bundleplugin/src/main/java/aQute/libg/reporter/ReporterAdapter.java
+++ b/bundleplugin/src/main/java/aQute/libg/reporter/ReporterAdapter.java
@@ -246,20 +246,9 @@
return getInfo(other,null);
}
public boolean getInfo(Report other, String prefix) {
- boolean ok = true;
- if ( prefix == null)
- prefix = "";
- else
- prefix = prefix + ": ";
- for ( String error : other.getErrors()) {
- errors.add( prefix + error);
- ok = false;
- }
-
- for ( String warning : other.getWarnings()) {
- warnings.add( prefix + warning);
- }
- return ok;
+ addErrors(prefix, other.getErrors());
+ addWarnings(prefix, other.getWarnings());
+ return other.isOk();
}
public Location getLocation(String msg) {
@@ -285,4 +274,31 @@
public <T> T getMessages(Class<T> c) {
return ReporterMessages.base(this, c);
}
+
+ /**
+ * Add a number of errors
+ */
+
+ public void addErrors( String prefix, Collection<String> errors) {
+ if ( prefix == null)
+ prefix = "";
+ else
+ prefix = prefix + ": ";
+ for ( String s: errors) {
+ this.errors.add( prefix + s);
+ }
+ }
+ /**
+ * Add a number of warnings
+ */
+
+ public void addWarnings( String prefix, Collection<String> warnings) {
+ if ( prefix == null)
+ prefix = "";
+ else
+ prefix = prefix + ": ";
+ for ( String s: warnings) {
+ this.warnings.add( prefix + s);
+ }
+ }
}