Author: pderop
Date: Tue Jan 12 08:10:31 2010
New Revision: 898225
URL: http://svn.apache.org/viewvc?rev=898225&view=rev
Log:
Fixed javadoc
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java?rev=898225&r1=898224&r2=898225&view=diff
==============================================================================
---
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
(original)
+++
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
Tue Jan 12 08:10:31 2010
@@ -25,7 +25,7 @@
import aQute.lib.osgi.Resource;
/**
- * This class is a BND plugin. It will scans the target bundle for
DependencyManager annotations.
+ * This class is a BND plugin. It scans the target bundle and look for
DependencyManager annotations.
* It can be directly used when using ant and can be referenced inside the
".bnd" descriptor, using
* the "-plugin" parameter.
*/
@@ -35,7 +35,7 @@
* This plugin is called after analysis of the JAR but before manifest
* generation. When some DM annotations are found, the plugin will add the
corresponding
* DM component descriptors under OSGI-INF/ directory. It will also set
the
- * "DependencyManager-Component" manifest header (which references the
descriptors paths).
+ * "DependencyManager-Component" manifest header (which references the
descriptor paths).
*
* @param analyzer the object that is used to retrieve classes containing
DM annotations.
* @return true if the classpace has been modified so that the bundle
classpath must be reanalyzed
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java?rev=898225&r1=898224&r2=898225&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java
Tue Jan 12 08:10:31 2010
@@ -81,9 +81,6 @@
* strings := string ( ',' string )*
* attributes := string ':' string ( ',' string : string )*
* string := [alphanum string]
- *
- * </pre>
- * </blockquote>
*/
public class DescriptorParser
{
@@ -142,7 +139,7 @@
}
}
}
-
+
m_logService.log(LogService.LOG_DEBUG, "Parsed " + entry + ": " +
toString());
return entry;
}
@@ -194,13 +191,14 @@
return def;
}
}
-
+
/**
* Once a component descriptor entry line is parsed, you can retrieve
entry attributes using this method.
* @param param
* @return
*/
- public String[] getStrings(DescriptorParam param) {
+ public String[] getStrings(DescriptorParam param)
+ {
Object value = m_params.get(param);
if (value == null)
{
@@ -229,14 +227,15 @@
return def;
}
}
-
+
/**
* Once a component descriptor entry line is parsed, you can retrieve
entry attributes using this method.
* @param param
* @return
*/
@SuppressWarnings("unchecked")
- public Dictionary<String, String> getDictionary(DescriptorParam param,
Dictionary<String, String> def) {
+ public Dictionary<String, String> getDictionary(DescriptorParam param,
Dictionary<String, String> def)
+ {
Object value = m_params.get(param);
if (value == null)
{
@@ -248,19 +247,26 @@
}
return (Dictionary<String, String>) value;
}
-
+
@Override
- public String toString() {
+ public String toString()
+ {
StringBuilder sb = new StringBuilder();
- for (Map.Entry<DescriptorParam, Object> entry : m_params.entrySet()) {
+ for (Map.Entry<DescriptorParam, Object> entry : m_params.entrySet())
+ {
sb.append(entry.getKey());
sb.append("=");
Object val = entry.getValue();
- if (val instanceof String || val instanceof Dictionary<?, ?>) {
+ if (val instanceof String || val instanceof Dictionary<?, ?>)
+ {
sb.append(val.toString());
- } else if (val instanceof String[]) {
+ }
+ else if (val instanceof String[])
+ {
sb.append(Arrays.toString((String[]) val));
- } else {
+ }
+ else
+ {
sb.append(val.toString());
}
sb.append(";");
