CVS update of <fraclet-annotation> (6 files)

[Nicolas Pessemier <pessemier@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Friday, March 31, 2006 @ 13:41:43
  Author: pessemier
    Path: /cvsroot/fractal/fraclet/fraclet-annotation

Modified: examples/comanche/src/comanche/RequestReceiver.java
          examples/primitive/src/primitive/Client.java
          src/org/objectweb/fractal/fraclet/annotation/FractalItf.java
          
src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java
          
          
src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java
          
          
src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java

change type of the "signature" parameter of @FractalItf annotation to Class 
(old was String)


---------------------------------------------------------------------------------------+
 examples/comanche/src/comanche/RequestReceiver.java                          
         |    2 +-
 examples/primitive/src/primitive/Client.java                                 
         |    2 +-
 src/org/objectweb/fractal/fraclet/annotation/FractalItf.java                 
         |    4 +++-
 
src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java
 |    2 +-
 
src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java
       |    2 +-
 
src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java
       |    8 ++++----
 6 files changed, 11 insertions(+), 9 deletions(-)


Index: 
fraclet/fraclet-annotation/examples/comanche/src/comanche/RequestReceiver.java
diff -u 
fraclet/fraclet-annotation/examples/comanche/src/comanche/RequestReceiver.java:1.5
 
fraclet/fraclet-annotation/examples/comanche/src/comanche/RequestReceiver.java:1.6
--- 
fraclet/fraclet-annotation/examples/comanche/src/comanche/RequestReceiver.java:1.5
  Fri Mar 17 21:53:23 2006
+++ 
fraclet/fraclet-annotation/examples/comanche/src/comanche/RequestReceiver.java
      Fri Mar 31 13:41:43 2006
@@ -28,7 +28,7 @@
 import org.objectweb.fractal.fraclet.annotation.FractalItf;
 
 @FractalComponent
-@FractalImportedInterface(interfaces=@FractalItf(name="r",signature="java.lang.Runnable"))
+@FractalImportedInterface(interfaces=@FractalItf(name="r",signature=Runnable.class))
 public class RequestReceiver implements Runnable {
 
        @FractalBC(name = "s")
Index: fraclet/fraclet-annotation/examples/primitive/src/primitive/Client.java
diff -u 
fraclet/fraclet-annotation/examples/primitive/src/primitive/Client.java:1.7 
fraclet/fraclet-annotation/examples/primitive/src/primitive/Client.java:1.8
--- 
fraclet/fraclet-annotation/examples/primitive/src/primitive/Client.java:1.7 
Fri Mar 31 10:44:12 2006
+++ fraclet/fraclet-annotation/examples/primitive/src/primitive/Client.java   
  Fri Mar 31 13:41:43 2006
@@ -39,7 +39,7 @@
  *
  */
 @FractalComponent
-@FractalImportedInterface(interfaces=@FractalItf(name="r",signature="java.lang.Runnable"))
+@FractalImportedInterface(interfaces=@FractalItf(name="r",signature=Runnable.class))
 public class Client implements Runnable {
 
        @FractalBC(name = "default")
Index: 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/FractalItf.java
diff -u 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/FractalItf.java:1.2
 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/FractalItf.java:1.3
--- 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/FractalItf.java:1.2
 Fri Mar 17 21:53:21 2006
+++ 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/FractalItf.java
     Fri Mar 31 13:41:43 2006
@@ -19,6 +19,8 @@
 
 package org.objectweb.fractal.fraclet.annotation;
 
+import org.objectweb.fractal.fraclet.annotation.template.util.None;
+
 /**
  * An annotation to generate Fractal-ADL files for Fractal interfaces
  * @author Nicolas Pessemier <Nicolas.Pessemier@xxxxxxx>
@@ -35,7 +37,7 @@
         * 
         * @return the java signature of the Fractal interface
         */
-       String signature() default "";
+       Class signature() default None.class;
        
        /**
         * 
Index: 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java
diff -u 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java:1.5
 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java:1.6
--- 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java:1.5
        Fri Mar 31 11:38:51 2006
+++ 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalComponentProcessor.java
    Fri Mar 31 13:41:43 2006
@@ -148,7 +148,7 @@
                        FractalItf[] itfAnnotations = 
importedItfAnnotation.interfaces();
                        for (FractalItf itfAnnotation : itfAnnotations) {
                                ADLFileFactory
-                                               .printItfSignature(pw, 
itfAnnotation.signature(),
+                                               .printItfSignature(pw, 
itfAnnotation.signature().getCanonicalName(),
                                                                
itfAnnotation.name(), itfAnnotation
                                                                              
  .cardinality(), itfAnnotation
                                                                              
  .contingency(),
Index: 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java
diff -u 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java:1.3
 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java:1.4
--- 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java:1.3
      Fri Mar 17 21:53:24 2006
+++ 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/FractalItfProcessor.java
  Fri Mar 31 13:41:43 2006
@@ -78,7 +78,7 @@
 
                        ADLFileFactory.printLicence(pw);
                        printBeginDefinition();
-                       ADLFileFactory.printItfSignature(pw, 
itf.getQualifiedName(),
+                       ADLFileFactory.printItfSignature(pw, 
processedItf.getQualifiedName(),
                                        annotation.name(), 
annotation.cardinality(), annotation
                                                        .contingency(), 
ADLFileFactory.ROLE_SERVER);
                        printEndDefinition();
Index: 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java
diff -u 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java:1.3
 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java:1.4
--- 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java:1.3
      Fri Mar 31 11:38:51 2006
+++ 
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java
  Fri Mar 31 13:41:43 2006
@@ -85,7 +85,7 @@
         * 
         * @param pw
         *            the printwriter to write with
-        * @param itfName
+        * @param signature
         *            the qualified name of the interface
         * @param fractalItfName
         *            the Fractal name of the interface
@@ -96,7 +96,7 @@
         * @param clientServer
         *            the role of the interface "client"|"server"
         */
-       public static void printItfSignature(PrintWriter pw, String itfName,
+       public static void printItfSignature(PrintWriter pw, String signature,
                        String fractalItfName, String cardinality, String 
contingency,
                        String clientServer) {
                if (cardinality == null)
@@ -104,9 +104,8 @@
 
                if (contingency == null)
                        contingency = "mandatory";
-
                pw.println("  <interface name=\"" + fractalItfName + "\" 
signature=\""
-                               + itfName + "\" role=\"" + clientServer + "\" 
cardinality=\""
+                               + signature + "\" role=\"" + clientServer + 
"\" cardinality=\""
                                + cardinality + "\" contingency=\"" + 
contingency + "\"/>");
        }
 
@@ -128,6 +127,7 @@
                        // 
itfName=fieldName.substring((fieldName.indexOf(',')+1),fieldName.length()-1).trim();
                        // itfName=field.getType().
                }
+
                printItfSignature(pw, itfName, fractalItfName, cardinality,
                                contingency, clientServer);
        }