Sync with latest bnd code for testing purposes

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1354104 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericType.java b/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericType.java
index d16affe..ce286f2 100644
--- a/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericType.java
+++ b/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericType.java
@@ -1,7 +1,7 @@
 package aQute.bnd.compatibility;
 
 public class GenericType {
-	public GenericType(Class<Object> class1) {
+	public GenericType(@SuppressWarnings("unused") Class<Object> class1) {
 		// TODO Auto-generated constructor stub
 	}
 
diff --git a/bundleplugin/src/main/java/aQute/bnd/compatibility/SignatureGenerator.java b/bundleplugin/src/main/java/aQute/bnd/compatibility/SignatureGenerator.java
deleted file mode 100644
index 6567ef8..0000000
--- a/bundleplugin/src/main/java/aQute/bnd/compatibility/SignatureGenerator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package aQute.bnd.compatibility;
-
-public class SignatureGenerator {
-	// enum ACCESS {
-	// // PUBLIC("+"), PROTECTED("|"), PACKAGE_PRIVATE(""), PRIVATE("-");
-	// // final String repr;
-	// //
-	// // ACCESS(String s) {
-	// // repr = s;
-	// // }
-	// //
-	// // public String toString() {
-	// // return repr;
-	// // }
-	// }
-	//
-	// public static void main(String args[]) throws Exception {
-	// final PrintStream out = System.err;
-	//
-	// Clazz c = new Clazz("x", new FileResource(new File(
-	// "src/aQute/bnd/compatibility/SignatureGenerator.class")));
-	// c.parseClassFileWithCollector(new ClassDataCollector() {
-	// public void classBegin(int access, String name) {
-	// out.print(name);
-	// out.println(access(access));
-	// }
-	//
-	// private ACCESS access(int access) {
-	// if (Modifier.isPublic(access))
-	// return ACCESS.PUBLIC;
-	//
-	// throw new IllegalArgumentException();
-	// }
-	//
-	// public void extendsClass(String name) {
-	// }
-	//
-	// public void implementsInterfaces(String name[]) {
-	// }
-	//
-	// public void addReference(String token) {
-	// }
-	//
-	// public void annotation(Annotation annotation) {
-	// }
-	//
-	// public void parameter(int p) {
-	// }
-	//
-	// public void method(Clazz.MethodDef defined) {
-	// if (defined.isConstructor())
-	// constructor(defined.access, defined.descriptor);
-	// else
-	// method(defined.access, defined.name, defined.descriptor);
-	// }
-	//
-	// public void field(Clazz.FieldDef defined) {
-	// field(defined.access, defined.name, defined.descriptor);
-	// }
-	//
-	// public void reference(Clazz.MethodDef referenced) {
-	// }
-	//
-	// public void reference(Clazz.FieldDef referenced) {
-	// }
-	//
-	// public void classEnd() {
-	// }
-	//
-	// @Deprecated// Will really be removed!
-	// public void field(int access, String name, String descriptor) {
-	// }
-	//
-	// @Deprecated// Will really be removed!
-	// public void constructor(int access, String descriptor) {
-	// }
-	//
-	// @Deprecated// Will really be removed!
-	// public void method(int access, String name, String descriptor) {
-	// }
-	//
-	// /**
-	// * The EnclosingMethod attribute
-	// *
-	// * @param cName
-	// * The name of the enclosing class, never null. Name is
-	// * with slashes.
-	// * @param mName
-	// * The name of the enclosing method in the class with
-	// * cName or null
-	// * @param mDescriptor
-	// * The descriptor of this type
-	// */
-	// public void enclosingMethod(String cName, String mName, String
-	// mDescriptor) {
-	//
-	// }
-	//
-	// /**
-	// * The InnerClass attribute
-	// *
-	// * @param innerClass
-	// * The name of the inner class (with slashes). Can be
-	// * null.
-	// * @param outerClass
-	// * The name of the outer class (with slashes) Can be
-	// * null.
-	// * @param innerName
-	// * The name inside the outer class, can be null.
-	// * @param modifiers
-	// * The access flags
-	// */
-	// public void innerClass(String innerClass, String outerClass, String
-	// innerName,
-	// int innerClassAccessFlags) {
-	// }
-	//
-	// public void signature(String signature) {
-	// }
-	//
-	// public void constant(Object object) {
-	// }
-	//
-	// });
-	// }
-}
diff --git a/bundleplugin/src/main/java/aQute/bnd/compatibility/Signatures.java b/bundleplugin/src/main/java/aQute/bnd/compatibility/Signatures.java
index 18b89a9..f387048 100644
--- a/bundleplugin/src/main/java/aQute/bnd/compatibility/Signatures.java
+++ b/bundleplugin/src/main/java/aQute/bnd/compatibility/Signatures.java
@@ -530,11 +530,9 @@
 	private String assign(Map<String,String> map, String name) {
 		if (map.containsKey(name))
 			return map.get(name);
-		else {
-			int n = map.size();
-			map.put(name, "_" + n);
-			return "_" + n;
-		}
+		int n = map.size();
+		map.put(name, "_" + n);
+		return "_" + n;
 	}
 
 	private boolean isInstance(Class< ? > type, String string) {