Mail Archive Home | fractal-commits List | November 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Friday, November 24, 2006 @ 16:59:20
Author: pessemier
Path: .../fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation
Modified: Interface.java Requires.java
generator/template/BindFcTemplate.java
generator/template/GetterSetterTemplate.java
generator/template/LookupFcTemplate.java
generator/template/NonTypedBindFcTemplate.java
generator/template/RequiresTemplate.java
generator/template/UnbindFcTemplate.java
processor/InterfaceProcessor.java
processor/util/ADLFileFactory.java
type safety
------------------------------------------------+
Interface.java | 2 +-
Requires.java | 2 +-
generator/template/BindFcTemplate.java | 8 ++++----
generator/template/GetterSetterTemplate.java | 4 ++--
generator/template/LookupFcTemplate.java | 4 ++--
generator/template/NonTypedBindFcTemplate.java | 8 ++++----
generator/template/RequiresTemplate.java | 8 ++++----
generator/template/UnbindFcTemplate.java | 4 ++--
processor/InterfaceProcessor.java | 4 ++--
processor/util/ADLFileFactory.java | 6 +++---
10 files changed, 25 insertions(+), 25 deletions(-)
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Interface.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Interface.java:1.3
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Interface.java:1.4
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Interface.java:1.3
Wed May 31 17:05:36 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Interface.java
Fri Nov 24 16:59:20 2006
@@ -43,7 +43,7 @@
*
* @return the java signature of the Fractal interface
*/
- Class signature() default None.class;
+ Class<?> signature() default None.class;
/**
*
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Requires.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Requires.java:1.2
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Requires.java:1.3
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Requires.java:1.2
Wed May 31 17:05:36 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/Requires.java
Fri Nov 24 16:59:20 2006
@@ -48,7 +48,7 @@
* collection interfaces (HashMap<String,Service>
* collectionBinding)
*/
- Class signature() default None.class;
+ Class<?> signature() default None.class;
/**
*
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/BindFcTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/BindFcTemplate.java:1.1
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/BindFcTemplate.java:1.2
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/BindFcTemplate.java:1.1
Fri Jun 2 16:36:54 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/BindFcTemplate.java
Fri Nov 24 16:59:20 2006
@@ -50,10 +50,10 @@
@Parameter
// A Type Reference which is the type of the singleton service
- CtTypeReference _T_;
+ CtTypeReference<?> _T_;
@Parameter
- CtTypeReference _R_;
+ CtTypeReference<?> _R_;
@Local
@@ -88,7 +88,7 @@
* @param serviceName
* The name of the java field
*/
- public BindFcTemplate(String itfName, CtTypeReference serviceType,
+ public BindFcTemplate(String itfName, CtTypeReference<?> serviceType,
String serviceName) {
this._itfName_ = itfName;
this._T_ = serviceType;
@@ -102,7 +102,7 @@
* @param fieldName
* the name of the map field
*/
- public BindFcTemplate(String itfName, String fieldName
,CtTypeReference serviceType) {
+ public BindFcTemplate(String itfName, String fieldName
,CtTypeReference<?> serviceType) {
this._itfName_ = itfName;
this.__servicesMap_ = fieldName;
this._R_=serviceType;
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/GetterSetterTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/GetterSetterTemplate.java:1.1
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/GetterSetterTemplate.java:1.2
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/GetterSetterTemplate.java:1.1
Tue Sep 5 16:59:12 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/GetterSetterTemplate.java
Fri Nov 24 16:59:20 2006
@@ -44,7 +44,7 @@
* a CtTypeReference of the type of the field
(field.getType())
*/
@Local
- public GetterSetterTemplate(String fieldName, CtTypeReference
typeRef) {
+ public GetterSetterTemplate(String fieldName, CtTypeReference<?>
typeRef) {
this.__fractalField_ = fieldName;
char[] chars = fieldName.toCharArray();
chars[0] = Character.toUpperCase(chars[0]);
@@ -54,7 +54,7 @@
// the TypeReference of the field type
@Parameter
- CtTypeReference _T_;
+ CtTypeReference<?> _T_;
// a local variable to reprensent the field itself
@Local
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/LookupFcTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/LookupFcTemplate.java:1.1
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/LookupFcTemplate.java:1.2
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/LookupFcTemplate.java:1.1
Fri Jun 2 16:36:54 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/LookupFcTemplate.java
Fri Nov 24 16:59:20 2006
@@ -48,7 +48,7 @@
@Parameter
// A Type Reference which is the type of the singleton service
- CtTypeReference _T_;
+ CtTypeReference<?> _T_;
@Local
// A Local variable which is the reference to the singeton field
@@ -81,7 +81,7 @@
* @param serviceName
* The name of the java field
*/
- public LookupFcTemplate(String itfName, CtTypeReference serviceType,
+ public LookupFcTemplate(String itfName, CtTypeReference<?>
serviceType,
String serviceName) {
this._itfName_ = itfName;
this._T_ = serviceType;
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/NonTypedBindFcTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/NonTypedBindFcTemplate.java:1.3
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/NonTypedBindFcTemplate.java:1.4
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/NonTypedBindFcTemplate.java:1.3
Wed Sep 6 14:04:37 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/NonTypedBindFcTemplate.java
Fri Nov 24 16:59:20 2006
@@ -49,7 +49,7 @@
@Parameter
// A Type Reference which is the type of the singleton service
- CtTypeReference _T_;
+ CtTypeReference<?> _T_;
@Local
@@ -71,7 +71,7 @@
@Local
// The field that contains the collection bindings (collection
bindings)
- Map _servicesMap_;
+ Map<String,Object> _servicesMap_;
/**
@@ -84,7 +84,7 @@
* @param serviceName
* The name of the java field
*/
- public NonTypedBindFcTemplate(String itfName, CtTypeReference
serviceType,
+ public NonTypedBindFcTemplate(String itfName, CtTypeReference<?>
serviceType,
String serviceName) {
this._itfName_ = itfName;
this._T_ = serviceType;
@@ -98,7 +98,7 @@
* @param fieldName
* the name of the map field
*/
- public NonTypedBindFcTemplate(String itfName, String fieldName
,CtTypeReference serviceType) {
+ public NonTypedBindFcTemplate(String itfName, String fieldName
,CtTypeReference<?> serviceType) {
this._itfName_ = itfName;
this.__servicesMap_ = fieldName;
this._T_=serviceType;
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/RequiresTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/RequiresTemplate.java:1.10
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/RequiresTemplate.java:1.11
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/RequiresTemplate.java:1.10
Wed Sep 6 14:04:37 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/RequiresTemplate.java
Fri Nov 24 16:59:20 2006
@@ -55,16 +55,16 @@
public class RequiresTemplate implements Template {
@Parameter
- TemplateParameterList _listFcAdds_;
+ TemplateParameterList<?> _listFcAdds_;
@Parameter
- TemplateParameterList _unbinds_;
+ TemplateParameterList<?> _unbinds_;
@Parameter
- TemplateParameterList _lookups_;
+ TemplateParameterList<?> _lookups_;
@Parameter
- TemplateParameterList _binds_;
+ TemplateParameterList<?> _binds_;
@Local
Factory spoonFactory;
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/UnbindFcTemplate.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/UnbindFcTemplate.java:1.1
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/UnbindFcTemplate.java:1.2
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/UnbindFcTemplate.java:1.1
Fri Jun 2 16:36:54 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/generator/template/UnbindFcTemplate.java
Fri Nov 24 16:59:20 2006
@@ -48,7 +48,7 @@
@Parameter
// A Type Reference which is the type of the singleton service
- CtTypeReference _T_;
+ CtTypeReference<?> _T_;
@Local
// A Local variable which is the reference to the singeton field
@@ -77,7 +77,7 @@
* @param serviceType
* @param serviceName
*/
- public UnbindFcTemplate(String itfName, CtTypeReference serviceType,
+ public UnbindFcTemplate(String itfName, CtTypeReference<?>
serviceType,
String serviceName) {
this._itfName_ = itfName;
this._T_ = serviceType;
Index:
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/InterfaceProcessor.java
diff -u
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/InterfaceProcessor.java:1.4
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/InterfaceProcessor.java:1.5
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/InterfaceProcessor.java:1.4
Wed Sep 6 14:04:37 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/InterfaceProcessor.java
Fri Nov 24 16:59:20 2006
@@ -34,7 +34,7 @@
*
*/
public class InterfaceProcessor extends
- AbstractAnnotationProcessor<Interface, CtSimpleType> {
+ AbstractAnnotationProcessor<Interface, CtSimpleType<?>> {
@Override
public void init() {
@@ -55,7 +55,7 @@
* @param processedItf
* the CtInterface processed
*/
- public void process(Interface itfAnnotation, CtSimpleType
processedItf) {
+ public void process(Interface itfAnnotation, CtSimpleType<?>
processedItf) {
if
(CtInterface.class.isAssignableFrom(processedItf.getClass())) {
new InterfaceADLGenerator(itfAnnotation,
processedItf);
}
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.8
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java:1.9
---
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java:1.8
Fri Aug 18 14:20:48 2006
+++
fraclet/fraclet-annotation/src/org/objectweb/fractal/fraclet/annotation/processor/util/ADLFileFactory.java
Fri Nov 24 16:59:20 2006
@@ -51,7 +51,7 @@
* @param CtSimpleType
* processed the processed element CtClass/CtInterface
*/
- public static File createADLFile(File spoonedDir, CtSimpleType
processed) {
+ public static File createADLFile(File spoonedDir, CtSimpleType<?>
processed) {
String directoryString = spoonedDir.toString() +
File.separator;
if (processed.getPackage().toString().length() > 0)
directoryString +=
processed.getPackage().getQualifiedName()
@@ -107,8 +107,8 @@
+ contingency.toString().toLowerCase() +
"\"/>");
}
- public static void printItfSignature(PrintWriter pw, CtField field,
- String fractalItfName, Class signature, Cardinality
cardinality,
+ public static void printItfSignature(PrintWriter pw, CtField<?> field,
+ String fractalItfName, Class<?> signature,
Cardinality cardinality,
Contingency contingency, String clientServer) {
// if (cardinality == null)
// cardinality = "singleton";
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.