You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2010/04/12 15:27:48 UTC
svn commit: r933227 - in
/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin: ./ mojo/
tags/annotation/ tags/annotation/defaulttag/ xml/
Author: cziegeler
Date: Mon Apr 12 13:27:48 2010
New Revision: 933227
URL: http://svn.apache.org/viewvc?rev=933227&view=rev
Log:
No code changes - just code and javadoc cleanup
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java Mon Apr 12 13:27:48 2010
@@ -20,19 +20,17 @@ package org.apache.felix.scrplugin;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
import org.apache.felix.scrplugin.om.Component;
import org.apache.felix.scrplugin.om.Components;
-import org.apache.felix.scrplugin.tags.ClassUtil;
-import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.*;
import org.apache.felix.scrplugin.tags.annotation.AnnotationJavaClassDescription;
import org.apache.felix.scrplugin.tags.annotation.AnnotationTagProviderManager;
import org.apache.felix.scrplugin.tags.cl.ClassLoaderJavaClassDescription;
import org.apache.felix.scrplugin.tags.qdox.QDoxJavaClassDescription;
import org.apache.felix.scrplugin.xml.ComponentDescriptorIO;
+
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaSource;
@@ -71,13 +69,10 @@ public abstract class JavaClassDescripto
/**
* Construct a new manager.
* @param log
- * @param project
* @param annotationTagProviders List of annotation tag providers
- * @param excludeString The exclude information for sources
* @param parseJavadocs Should the javadocs be parsed?
* @param processAnnotations Should the annotations be processed?
* @throws SCRDescriptorFailureException
- * @throws SCRDescriptorException
*/
public JavaClassDescriptorManager( final Log log, final ClassLoader classLoader,
final String[] annotationTagProviders, final boolean parseJavadocs, final boolean processAnnotations )
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java Mon Apr 12 13:27:48 2010
@@ -19,27 +19,11 @@
package org.apache.felix.scrplugin.mojo;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.apache.felix.scrplugin.Constants;
-import org.apache.felix.scrplugin.JavaClassDescriptorManager;
-import org.apache.felix.scrplugin.Log;
-import org.apache.felix.scrplugin.SCRDescriptorException;
-import org.apache.felix.scrplugin.SCRDescriptorFailureException;
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+
+import org.apache.felix.scrplugin.*;
import org.apache.felix.scrplugin.helper.StringUtils;
import org.apache.felix.scrplugin.om.Component;
import org.apache.felix.scrplugin.om.Components;
@@ -47,6 +31,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
+
import com.thoughtworks.qdox.JavaDocBuilder;
import com.thoughtworks.qdox.model.JavaSource;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Mon Apr 12 13:27:48 2010
@@ -22,21 +22,12 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.felix.scrplugin.JavaClassDescriptorManager;
-import org.apache.felix.scrplugin.SCRDescriptorException;
-import org.apache.felix.scrplugin.SCRDescriptorFailureException;
-import org.apache.felix.scrplugin.SCRDescriptorGenerator;
+import java.util.*;
+
+import org.apache.felix.scrplugin.*;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.*;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
@@ -193,7 +184,6 @@ public class SCRDescriptorMojo extends A
throw new MojoFailureException( "Unable to add target directory to classloader.");
}
- int i = 1;
for (Iterator<Artifact> ai=artifacts.iterator(); ai.hasNext(); ) {
Artifact a = ai.next();
try {
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java Mon Apr 12 13:27:48 2010
@@ -18,14 +18,11 @@
*/
package org.apache.felix.scrplugin.tags.annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import org.apache.felix.scrplugin.JavaClassDescriptorManager;
import org.apache.felix.scrplugin.SCRDescriptorException;
-import org.apache.felix.scrplugin.tags.JavaField;
-import org.apache.felix.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.*;
import org.apache.felix.scrplugin.tags.qdox.QDoxJavaClassDescription;
import com.thoughtworks.qdox.model.JavaClass;
@@ -39,7 +36,7 @@ public class AnnotationJavaClassDescript
/**
* @param clazz Java class
- * @param source QDox source
+ * @param javaClass QDox source
* @param manager description manager
*/
public AnnotationJavaClassDescription(Class<?> clazz, JavaClass javaClass, JavaClassDescriptorManager manager) {
@@ -47,7 +44,7 @@ public class AnnotationJavaClassDescript
}
/**
- * @see JavaClassDescription#getTagByName(String)
+ * @see org.apache.felix.scrplugin.tags.JavaClassDescription#getTagByName(String)
*/
@Override
public JavaTag getTagByName(String name) {
@@ -63,7 +60,7 @@ public class AnnotationJavaClassDescript
}
/**
- * @see JavaClassDescription#getTagsByName(String, boolean)
+ * @see org.apache.felix.scrplugin.tags.JavaClassDescription#getTagsByName(String, boolean)
*/
@Override
public JavaTag[] getTagsByName(String name, boolean inherited) throws SCRDescriptorException {
@@ -89,7 +86,7 @@ public class AnnotationJavaClassDescript
}
/**
- * @see JavaClassDescription#getFields()
+ * @see org.apache.felix.scrplugin.tags.JavaClassDescription#getFields()
*/
@Override
public JavaField[] getFields() {
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java Mon Apr 12 13:27:48 2010
@@ -47,7 +47,7 @@ public class AnnotationTagProviderManage
/**
* @param annotationTagProviderClasses List of classes that implements
* {@link AnnotationTagProvider} interface.
- * @throws MojoFailureException
+ * @throws SCRDescriptorFailureException
*/
public AnnotationTagProviderManager(String[] annotationTagProviderClasses) throws SCRDescriptorFailureException {
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java Mon Apr 12 13:27:48 2010
@@ -291,7 +291,7 @@ public abstract class Util {
public static Class<?> getClassValue(Annotation annotation, String name, final Class<?> clazz) {
final Object obj = annotation.getNamedParameter(name);
if ( obj != null ) {
- if ( obj instanceof Class ) {
+ if ( obj instanceof Class<?> ) {
return (Class<?>)obj;
}
return ClassUtil.getClass(obj.toString());
@@ -304,6 +304,7 @@ public abstract class Util {
}
}
+ @SuppressWarnings("unchecked")
public static <T extends Enum> T getEnumValue(Annotation annotation,
String name,
final Class<T> enumClass,
@@ -336,6 +337,7 @@ public abstract class Util {
return null;
}
+ @SuppressWarnings("unchecked")
public static <T extends Enum> T getEnumValue(Annotation annotation,
String name,
final Class<T> enumClass,
@@ -399,7 +401,8 @@ public abstract class Util {
}
};
- List<Object> valueList = evaluatingVisitor.getListValue(annotation, name);
+ @SuppressWarnings("unchecked")
+ final List<Object> valueList = evaluatingVisitor.getListValue(annotation, name);
if (valueList==null) {
return null;
}
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java?rev=933227&r1=933226&r2=933227&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java Mon Apr 12 13:27:48 2010
@@ -46,7 +46,6 @@ public class IOUtils {
* Parse a file and send the sax events to the content handler.
* @param file
* @param handler
- * @throws IOException
* @throws TransformerException
*/
public static final void parse(InputStream file, ContentHandler handler)