CVS update of fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet (1 file)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Thursday, January 20, 2005 @ 13:06:06
  Author: rouvoy
    Path: /cvsroot/gotm/fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet

Modified: FractalTagsHandler.java

* Correction of the Fractal handler to handle any type of controller.


-------------------------+
 FractalTagsHandler.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


Index: 
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FractalTagsHandler.java
diff -u 
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FractalTagsHandler.java:1.4
 
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FractalTagsHandler.java:1.5
--- 
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FractalTagsHandler.java:1.4
  Mon Jan 10 17:12:30 2005
+++ 
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FractalTagsHandler.java
      Thu Jan 20 13:06:06 2005
@@ -23,7 +23,7 @@
  Contributor(s): .
  
  ---------------------------------------------------------------------
- $Id: FractalTagsHandler.java,v 1.4 2005/01/10 16:12:30 rouvoy Exp $
+ $Id: FractalTagsHandler.java,v 1.5 2005/01/20 12:06:06 rouvoy Exp $
  ====================================================================*/
 package org.objectweb.fractal.xdoclet;
 
@@ -46,7 +46,7 @@
  * Tags relating to Fractal components being processed and class-level 
  * attributes.
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  * @xdoclet.taghandler namespace="Fractal"
  */
 public class FractalTagsHandler 
@@ -74,11 +74,15 @@
      * @return true if the interface is a controller.
      */
     protected static final boolean isFcController(final XClass itf) {
-        if(isFcAttributeController(itf))
+//        if(itf.isA(PKG_CONTROLLER+"BindingController"))
+//            return true;
+//        if(itf.isA(PKG_CONTROLLER+"LifeCycleController"))
+//            return true;
+        if(itf.getQualifiedName().endsWith("Controller"))
             return true;
-        if(itf.isA(PKG_CONTROLLER+"BindingController"))
+        if(itf.getQualifiedName().startsWith(PKG_CONTROLLER))
             return true;
-        if(itf.isA(PKG_CONTROLLER+"LifeCycleController"))
+        if(isFcAttributeController(itf))
             return true;
         return false;
     }
@@ -99,7 +103,7 @@
         File f = new 
File(DocletContext.getInstance().getDestDir()+"\\"+name);
         if (f.exists()) 
             return true;
-        System.err.println("Failed to find "+f.getAbsolutePath());
+        //System.err.println("Failed to find "+f.getAbsolutePath());
         return false; 
     }