Latest bnd sync

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1370165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java b/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java
index e03865a..1a325e6 100755
--- a/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java
+++ b/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java
@@ -251,11 +251,13 @@
 			this.descriptor = analyzer.getDescriptor(descriptor);
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 		
 
+		@Override
 		public TypeRef getType() {
 			return descriptor.getType();
 		}
@@ -290,6 +292,7 @@
 			return objectDescriptorToFQN(returnType);
 		}
 
+		@Override
 		public TypeRef[] getPrototype() {
 			return null;
 		}
@@ -297,6 +300,7 @@
 			return signature;
 		}
 
+		@Override
 		public String toString() {
 			return name;
 		}
@@ -311,6 +315,7 @@
 			return name.equals("<init>") || name.equals("<clinit>");
 		}
 
+		@Override
 		public TypeRef[] getPrototype() {
 			return descriptor.getPrototype();
 		}
@@ -335,16 +340,18 @@
 		}
 		
 
+		@Override
 		public String getName() {
 			if (interf)
 				return "<implements>";
-			else
-				return "<extends>";
+			return "<extends>";
 		}
 		
+		@Override
 		public TypeRef getType() {
 			return type;
 		}
+		@Override
 		public TypeRef[] getPrototype() {
 			return null;
 		}
@@ -1527,6 +1534,7 @@
 		return clazz.is(query, instr, analyzer);
 	}
 
+	@Override
 	public String toString() {
 		return className.getFQN();
 	}