[jboss-cvs] jboss-seam/src/main/org/jboss/seam/deployment ...

[Gavin King]

  User: gavin   
  Date: 06/10/15 17:55:41

  Modified:    src/main/org/jboss/seam/deployment  Scanner.java
  Log:
  package import
  
  Revision  Changes    Path
  1.13      +12 -10    jboss-seam/src/main/org/jboss/seam/deployment/Scanner.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Scanner.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/deployment/Scanner.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Scanner.java	23 Jun 2006 11:14:11 -0000	1.12
  +++ Scanner.java	15 Oct 2006 21:55:41 -0000	1.13
  @@ -1,4 +1,4 @@
  -//$Id: Scanner.java,v 1.12 2006/06/23 11:14:11 theute Exp $
  +//$Id: Scanner.java,v 1.13 2006/10/15 21:55:41 gavin Exp $
   package org.jboss.seam.deployment;
   
   import java.io.DataInputStream;
  @@ -50,9 +50,9 @@
      /**
       * Returns only Seam components (ie: classes annotated with @Name)
       */
  -   public Set<Class<?>> getClasses()
  +   public Set<Class<Object>> getClasses()
      {
  -      Set<Class<?>> result = new HashSet<Class<?>>();
  +      Set<Class<Object>> result = new HashSet<Class<Object>>();
         Enumeration<URL> urls;
         try
         {
  @@ -101,7 +101,7 @@
         return result;
      }
   
  -   private void handleArchive(Set<Class<?>> result, File file) throws ZipException, IOException
  +   private void handleArchive(Set<Class<Object>> result, File file) throws ZipException, IOException
      {
         log.debug("archive: " + file);
         ZipFile zip = new ZipFile(file);
  @@ -115,7 +115,7 @@
         }
      }
   
  -   private void handleDirectory(Set<Class<?>> result, File file, String path)
  +   private void handleDirectory(Set<Class<Object>> result, File file, String path)
      {
         log.debug("directory: " + file);
         for ( File child: file.listFiles() )
  @@ -133,16 +133,17 @@
         }
      }
   
  -   private void handleItem(Set<Class<?>> result, String name)
  +   private void handleItem(Set<Class<Object>> result, String name)
      {
         if ( name.endsWith(".class") && !name.startsWith("org/jboss/seam/core") )
         {
  -         String classname = filenameToClassname( name );
  +         String classname = filenameToClassname(name);
            try
            {
  -            if (hasAnnotation(getClassFile(name), Name.class))
  +            ClassFile classFile = getClassFile(name);
  +            if ( hasAnnotation(classFile, Name.class) )
               {
  -               result.add( classLoader.loadClass( classname ) );
  +               result.add( (Class<Object>) classLoader.loadClass(classname) );
               }
            }
            catch (ClassNotFoundException cnfe)
  @@ -179,7 +180,8 @@
      private boolean hasAnnotation(ClassFile cf, Class<? extends Annotation> annotationType)
      { 
         AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute( AnnotationsAttribute.visibleTag ); 
  -      if ( visible != null ) { 
  +      if ( visible != null ) 
  +      {
            return visible.getAnnotation( annotationType.getName() ) != null; 
         } 
         return false;