FELIX-2863 : Warnings and error messages contain @scr.* if annotations are used
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1079728 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
index aba923b..cb400ca 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
@@ -121,6 +121,11 @@
}
@Override
+ public String getSourceName() {
+ return "Component";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
index 06a5ecc..47efce5 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
@@ -145,6 +145,11 @@
}
@Override
+ public String getSourceName() {
+ return "Property";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new LinkedHashMap<String, String>();
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
index 292e2b5..0c27191 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
@@ -94,6 +94,11 @@
}
@Override
+ public String getSourceName() {
+ return "Reference";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
index cc80aee..0cbf0e5 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
@@ -57,6 +57,11 @@
}
@Override
+ public String getSourceName() {
+ return "Service";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
index a32d026..f9b0638 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
@@ -59,6 +59,11 @@
}
@Override
+ public String getSourceName() {
+ return "SlingFilter";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final Map<String, String> params = new HashMap<String, String>();
if ( this.name != null ) {
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
index 361d842..8991482 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
@@ -48,6 +48,11 @@
}
@Override
+ public String getSourceName() {
+ return "SlingFilter";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
return INTERFACE_MAP;
}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
index 34ea998..84450a6 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
@@ -45,6 +45,11 @@
}
@Override
+ public String getSourceName() {
+ return "SlingServlet";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
return Collections.emptyMap();
}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
index 885ecd5..e17533c 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
@@ -74,6 +74,11 @@
}
@Override
+ public String getSourceName() {
+ return "SlingServlet";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
final SortedMap<String, String> map = new TreeMap<String, String>();
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
index 8f5f1a5..da9944b 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
@@ -48,6 +48,11 @@
}
@Override
+ public String getSourceName() {
+ return "SlingServlet";
+ }
+
+ @Override
public Map<String, String> createNamedParameterMap() {
return INTERFACE_MAP;
}
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
index 45511d6..425865e 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
@@ -34,11 +34,11 @@
}
protected void logWarn(IssueLog iLog, String message) {
- iLog.addWarning( "@" + this.tag.getName() + ": " + message, tag.getSourceLocation(), tag.getLineNumber() );
+ iLog.addWarning( "@" + this.tag.getSourceName() + ": " + message, tag.getSourceLocation(), tag.getLineNumber() );
}
protected void logError(IssueLog iLog, String message) {
- iLog.addError( "@" + this.tag.getName() + ": " + message, tag.getSourceLocation(), tag.getLineNumber() );
+ iLog.addError( "@" + this.tag.getSourceName() + ": " + message, tag.getSourceLocation(), tag.getLineNumber() );
}
public JavaTag getJavaTag() {
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
index 336f103..e4fc755 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
@@ -26,8 +26,17 @@
*/
public interface JavaTag {
+ /**
+ * The name of the tag, e.g. scr.component etc.
+ */
String getName();
+ /**
+ * The name of the tag as used in the source code.
+ * For javadoc tags this is like {@link #getName()}, for annoations this is different.
+ */
+ String getSourceName();
+
String[] getParameters();
String getNamedParameter(String arg0);
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java
index 13c5ca9..e54d445 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java
@@ -115,6 +115,11 @@
public abstract String getName();
/**
+ * @see JavaTag#getSourceName()
+ */
+ public abstract String getSourceName();
+
+ /**
* @see org.apache.felix.scrplugin.tags.JavaTag#getNamedParameterMap()
*/
public Map<String, String> getNamedParameterMap() {
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
index f3f8af2..4e7118d 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
@@ -89,6 +89,13 @@
}
/**
+ * @see org.apache.felix.scrplugin.tags.JavaTag#getSourceName()
+ */
+ public String getSourceName() {
+ return this.getName();
+ }
+
+ /**
* @see org.apache.felix.scrplugin.tags.JavaTag#getNamedParameter(java.lang.String)
*/
public String getNamedParameter(String name) {
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
index 91eaac2..3ccf010 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
@@ -54,6 +54,13 @@
}
/**
+ * @see org.apache.felix.scrplugin.tags.JavaTag#getSourceName()
+ */
+ public String getSourceName() {
+ return this.getName();
+ }
+
+ /**
* @see org.apache.felix.scrplugin.tags.JavaTag#getNamedParameter(java.lang.String)
*/
public String getNamedParameter(String arg0) {