Pick up bndlib multimap fix
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1362046 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/collections/MultiMap.java b/bundleplugin/src/main/java/aQute/lib/collections/MultiMap.java
index 322a2e8..9bf8481 100644
--- a/bundleplugin/src/main/java/aQute/lib/collections/MultiMap.java
+++ b/bundleplugin/src/main/java/aQute/lib/collections/MultiMap.java
@@ -23,6 +23,12 @@
this.valueClass = valueClass;
}
+ public MultiMap(Map<K,List<V>> other) {
+ this();
+ for ( java.util.Map.Entry<K,List<V>> e : other.entrySet()) {
+ addAll(e.getKey(), e.getValue());
+ }
+ }
public MultiMap(MultiMap<K,V> other) {
keyClass = other.keyClass;
valueClass = other.valueClass;
@@ -163,4 +169,5 @@
return inverted;
}
+
}
diff --git a/bundleplugin/src/main/java/aQute/lib/getopt/CommandLineMessages.java b/bundleplugin/src/main/java/aQute/lib/getopt/CommandLineMessages.java
index 4f2cce3..8d65141 100644
--- a/bundleplugin/src/main/java/aQute/lib/getopt/CommandLineMessages.java
+++ b/bundleplugin/src/main/java/aQute/lib/getopt/CommandLineMessages.java
@@ -2,7 +2,7 @@
import java.util.*;
-import aQute.libg.reporter.*;
+import aQute.service.reporter.*;
public interface CommandLineMessages extends Messages {