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/component/AnnotationReader.java b/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java
index 1ca3af7..09c5f25 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java
@@ -129,6 +129,7 @@
 		return null;
 	}
 
+	@Override
 	public void annotation(Annotation annotation) {
 		try {
 			java.lang.annotation.Annotation a = annotation.getAnnotation();
diff --git a/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java b/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java
index e66ad0c..f3840f3 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java
@@ -29,15 +29,13 @@
 				if (instruction.matches(c.getFQN())) {
 					if (instruction.isNegated())
 						break;
-					else {
-						ComponentDef definition = AnnotationReader.getDefinition(c, analyzer);
-						if (definition != null) {
-							definition.sortReferences();
-							definition.prepare(analyzer);
-							String name = "OSGI-INF/" + definition.name + ".xml";
-							names.add(name);
-							analyzer.getJar().putResource(name, new TagResource(definition.getTag()));
-						}
+					ComponentDef definition = AnnotationReader.getDefinition(c, analyzer);
+					if (definition != null) {
+						definition.sortReferences();
+						definition.prepare(analyzer);
+						String name = "OSGI-INF/" + definition.name + ".xml";
+						names.add(name);
+						analyzer.getJar().putResource(name, new TagResource(definition.getTag()));
 					}
 				}
 			}
diff --git a/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java b/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java
index a794027..aa1e6e7 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java
@@ -91,6 +91,7 @@
 			
 			clazz.parseClassFileWithCollector(new ClassDataCollector() {
 				
+				@Override
 				public void method(MethodDef md) {
 					Set<String> allowedParams = allowed;
 					String lifecycleName = null;
diff --git a/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java b/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
index fc09c52..cb4d489 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
@@ -88,6 +88,7 @@
 		return b;
 	}
 
+	@Override
 	public String toString() {
 		return name;
 	}
diff --git a/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java b/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java
index 1155d99..814a2b6 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java
@@ -12,6 +12,7 @@
 		this.tag = tag;
 	}
 
+	@Override
 	public void write(OutputStream out) throws UnsupportedEncodingException {
 		OutputStreamWriter ow = new OutputStreamWriter(out, "UTF-8");
 		PrintWriter pw = new PrintWriter(ow);
@@ -24,6 +25,7 @@
 		}
 	}
 
+	@Override
 	public long lastModified() {
 		return 0;
 	}