Mail Archive Home | fractal-commits List | December 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Wednesday, December 20, 2006 @ 21:29:37
Author: seintur
Path: /cvsroot/fractal/julia
Modified: build.xml src/org/objectweb/fractal/juliak/FractalHelper.java
src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java
src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java
src/org/objectweb/fractal/juliak/asm/TreeParser.java
src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java
src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java
src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java
src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java
src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java
src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java
src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java
src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
src/org/objectweb/fractal/juliak/membrane/Membranes.java
src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java
1.3 compliance for componentized membranes.
-----------------------------------------------------------------------------------------+
build.xml
| 11 -----
src/org/objectweb/fractal/juliak/FractalHelper.java
| 4 -
src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java
| 3 -
src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java
| 11 +++--
src/org/objectweb/fractal/juliak/asm/TreeParser.java
| 2
src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java
| 5 +-
src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java
| 5 +-
src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java
| 2
src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java
| 21 ++++++----
src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java
| 2
src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java
| 12 +++--
src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java
| 2
src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
| 8 +--
src/org/objectweb/fractal/juliak/membrane/Membranes.java
| 2
src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java
| 2
15 files changed, 48 insertions(+), 44 deletions(-)
Index: julia/build.xml
diff -u julia/build.xml:1.14 julia/build.xml:1.15
--- julia/build.xml:1.14 Thu Dec 7 21:40:14 2006
+++ julia/build.xml Wed Dec 20 21:29:35 2006
@@ -105,9 +105,8 @@
<target name="compile" depends="init" description="Compiles Julia">
<antcall target="compile-julia" />
- <available classname="java.util.Scanner" property="java5" />
- <antcall target="check.compile-juliak" />
<antcall target="compile-juliak" />
+ <antcall target="compile-julia-j2me" />
</target>
<target name="compile-julia">
@@ -138,13 +137,7 @@
<!-- ====== COMPILE JULIAK ======= -->
<!-- =================================== -->
- <target name="check.compile-juliak" unless="java5">
- <echo message="A Java 5 compatible compiler is needed to compile
Juliak." />
- <echo message="Juliak manages component-based control membrane." />
- <echo message="You can still use Julia without Juliak." />
- </target>
-
- <target name="compile-juliak" if="java5">
+ <target name="compile-juliak">
<!-- Compile Juliak source code -->
<mkdir dir="${out.build}" />
<javac destdir="${out.build}">
Index: julia/src/org/objectweb/fractal/juliak/FractalHelper.java
diff -u julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.6
julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.7
--- julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.6 Sat
Dec 16 20:43:32 2006
+++ julia/src/org/objectweb/fractal/juliak/FractalHelper.java Wed Dec 20
21:29:37 2006
@@ -202,7 +202,7 @@
* Return all sub-components of the given component.
*/
public static Component[] getAllSubComponents( Component c ) {
- List<Component> l = new ArrayList<Component>();
+ List l = new ArrayList();
addAllSubComponents(c,l);
return (Component[]) l.toArray( new Component[l.size()] );
}
@@ -210,7 +210,7 @@
/**
* Add all sub-components of the given component to the list.
*/
- public static void addAllSubComponents( Component c, List<Component> l )
{
+ public static void addAllSubComponents( Component c, List l ) {
if( l == null ) {
throw new IllegalArgumentException(
Index: julia/src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java
diff -u
julia/src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java:1.1
julia/src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java:1.2
---
julia/src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java:1.1
Mon Dec 11 20:49:48 2006
+++ julia/src/org/objectweb/fractal/juliak/asm/AbstractClassGenerator.java
Wed Dec 20 21:29:36 2006
@@ -114,8 +114,7 @@
}
/** The map of already generated classes. */
- private Map<String,ClassDefinition> classes =
- new HashMap<String,ClassDefinition>();
+ private Map classes = new HashMap();
/**
* Return the name of the class generated by the current class generator
Index:
julia/src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java
diff -u
julia/src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java:1.7
julia/src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java:1.8
---
julia/src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java:1.7
Mon Dec 11 20:49:48 2006
+++ julia/src/org/objectweb/fractal/juliak/asm/InterceptorClassGenerator.java
Wed Dec 20 21:29:36 2006
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.objectweb.fractal.api.type.InterfaceType;
@@ -151,15 +152,17 @@
* public fields (e.g. fcInvocationCounter). We can then not rely on
* control interfaces, and we need implementation classes.
*/
- List<Class<?>> ctrlclasses = new ArrayList<Class<?>>();
+ List ctrlclasses = new ArrayList();
Collection values = ic.interfaces.values();
- for (Object o : values) {
- Class<?> cl = o.getClass();
+ for (Iterator iter = values.iterator(); iter.hasNext();) {
+ Object o = iter.next();
+ Class cl = o.getClass();
ctrlclasses.add(cl);
}
Tree[] ctrls = new Tree[ctrlclasses.size()];
int i = 0;
- for (Class<?> ctrlclass : ctrlclasses) {
+ for (Iterator iter = ctrlclasses.iterator(); iter.hasNext();) {
+ Class ctrlclass = (Class) iter.next();
ctrls[i] = new Tree(ctrlclass.getName());
i++;
}
Index: julia/src/org/objectweb/fractal/juliak/asm/TreeParser.java
diff -u julia/src/org/objectweb/fractal/juliak/asm/TreeParser.java:1.2
julia/src/org/objectweb/fractal/juliak/asm/TreeParser.java:1.3
--- julia/src/org/objectweb/fractal/juliak/asm/TreeParser.java:1.2 Fri
Nov 10 21:06:38 2006
+++ julia/src/org/objectweb/fractal/juliak/asm/TreeParser.java Wed Dec 20
21:29:36 2006
@@ -68,7 +68,7 @@
} else if (c == '(') {
// parses a tree of the form "(subTree1 ... subTreeN)"
read();
- List<Tree> subTrees = new ArrayList<Tree>();
+ List subTrees = new ArrayList();
while (true) {
c = parseSpaces();
if (c == ')') {
Index:
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java:1.2
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java:1.3
---
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java:1.2
Sat Dec 16 20:29:46 2006
+++
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorCompControllerImpl.java
Wed Dec 20 21:29:35 2006
@@ -53,7 +53,7 @@
BindingController bc =
((BindingController)(ic.interfaces.get(("//" +
(BindingControllerDef.NAME)))));
String[] itfNames = bc.listFc();
InitializationContext intic = new InitializationContext();
- intic.interfaces = new HashMap<java.lang.String,
java.lang.Object> ();
+ intic.interfaces = new HashMap();
for (int i = 0 ; i < (itfNames.length) ; i++) {
String itfName = itfNames[i].substring(2);
Object end =
org.objectweb.fractal.juliak.FractalHelper.lookupFc(bc ,itfNames[i]);
@@ -72,7 +72,8 @@
}
ComponentType ct = ((ComponentType)(compctrl.getFcType()));
InterfaceType[] its = ct.getFcInterfaceTypes();
- for (InterfaceType it : its) {
+ for (int i = 0; i < its.length; i++) {
+ InterfaceType it = its[i];
String itfName = it.getFcItfName();
if (it.isFcCollectionItf()) {
itfName = "/juliak/collection/" + (it.getFcItfName());
Index:
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java
diff -u
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java:1.7
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java:1.8
---
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java:1.7
Fri Nov 10 21:06:38 2006
+++
julia/src/org/objectweb/fractal/juliak/control/interceptor/InterceptorControllerMixin.java
Wed Dec 20 21:29:35 2006
@@ -72,7 +72,7 @@
ic.interfaces.get("//"+BindingControllerDef.NAME);
String[] itfNames = bc.listFc();
InitializationContext intic = new InitializationContext();
- intic.interfaces = new HashMap<String,Object>();
+ intic.interfaces = new HashMap();
for (int i = 0; i < itfNames.length; i++) {
String itfName = itfNames[i].substring(2); // Strip //
Object end = FractalHelper.lookupFc(bc, itfNames[i]);
@@ -97,7 +97,8 @@
*/
ComponentType ct = (ComponentType) compctrl.getFcType();
InterfaceType[] its = ct.getFcInterfaceTypes();
- for (InterfaceType it : its) {
+ for (int i = 0; i < its.length; i++) {
+ InterfaceType it = its[i];
String itfName = it.getFcItfName();
if( it.isFcCollectionItf() ) {
itfName = "/juliak/collection/" + it.getFcItfName();
Index:
julia/src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java:1.1
julia/src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java:1.2
---
julia/src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java:1.1
Mon Dec 18 22:12:24 2006
+++
julia/src/org/objectweb/fractal/juliak/factory/AbstractGenericFactoryImpl.java
Wed Dec 20 21:29:35 2006
@@ -455,7 +455,7 @@
// Checked before by checkFcType
// but we need the class here anyway
- Class<?> itClass;
+ Class itClass;
try {
itClass = Platform.get().loadClass(itSignature);
}
Index:
julia/src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java:1.4
julia/src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java:1.5
---
julia/src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java:1.4
Tue Dec 19 21:44:01 2006
+++
julia/src/org/objectweb/fractal/juliak/factory/CompBasedMembraneGenericFactoryImpl.java
Wed Dec 20 21:29:35 2006
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -209,10 +210,11 @@
/*
* Retrieve all controllers.
*/
- Map<Object,Component> ctrls = new HashMap<Object,Component>();
- List<Component> l = new ArrayList<Component>();
+ Map ctrls = new HashMap();
+ List l = new ArrayList();
FractalHelper.addAllSubComponents(membrane,l);
- for( Component comp : l ) {
+ for (Iterator iter = l.iterator(); iter.hasNext();) {
+ Component comp = (Component) iter.next();
// composite control components may have a null content
Object ctrl = FractalHelper.getContent(comp);
@@ -236,7 +238,7 @@
Component proxyForCompctrl = (Component) proxy;
ic.interfaces.put( "component", proxyForCompctrl );
- List<InterfaceType> fullITs = new ArrayList<InterfaceType>();
+ List fullITs = new ArrayList();
fullITs.add(it);
/*
@@ -333,7 +335,8 @@
* fcinterfaces.
*/
// First the Component control-component
- for( Object o : ic.controllers ) {
+ for (Iterator iter = ic.controllers.iterator(); iter.hasNext();) {
+ Object o = iter.next();
if( o instanceof Component ) {
Controller ctrl = (Controller) o;
ctrl.initFcController(ic);
@@ -341,7 +344,8 @@
}
// Second the Content control-component
- for( Object o : ic.controllers ) {
+ for (Iterator iter = ic.controllers.iterator(); iter.hasNext();) {
+ Object o = iter.next();
if( o instanceof ContentController ) {
Controller ctrl = (Controller) o;
Component ctrlcomp = (Component) ctrls.get(ctrl);
@@ -355,7 +359,8 @@
}
// Remaining control-components
- for( Object o : ic.controllers ) {
+ for (Iterator iter = ic.controllers.iterator(); iter.hasNext();) {
+ Object o = iter.next();
if( o instanceof Component || o instanceof ContentController ) {
continue;
@@ -372,7 +377,7 @@
}
Controller ctrl = (Controller) o;
- Component ctrlcomp = ctrls.get(ctrl);
+ Component ctrlcomp = (Component) ctrls.get(ctrl);
InitializationContext localic = new InitializationContext();
localic.content = ic.content;
Index: julia/src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java:1.3
julia/src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java:1.4
--- julia/src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java:1.3
Fri Nov 10 21:06:38 2006
+++ julia/src/org/objectweb/fractal/juliak/factory/TypeFactoryImpl.java Wed
Dec 20 21:29:35 2006
@@ -111,7 +111,7 @@
return;
}
- Set<String> interfaceNames = new HashSet<String>();
+ Set interfaceNames = new HashSet();
for (int i = 0; i < interfaceTypes.length; i++) {
InterfaceType itf = interfaceTypes[i];
Index: julia/src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java:1.6
julia/src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java:1.7
--- julia/src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java:1.6
Thu Dec 7 21:40:14 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/JuliakMembranes.java
Wed Dec 20 21:29:35 2006
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -50,14 +51,15 @@
/*
* Retrieve additional membrane definitions.
*/
- List<MembraneDefProvider> mdps = getAdditionalMembraneDefs();
+ List mdps = getAdditionalMembraneDefs();
if( mdps == null ) {
return basic;
}
- List<MembraneDef> all = new ArrayList<MembraneDef>();
+ List all = new ArrayList();
all.addAll(Arrays.asList(basic));
- for (MembraneDefProvider mdp : mdps) {
+ for (Iterator iter = mdps.iterator(); iter.hasNext();) {
+ MembraneDefProvider mdp = (MembraneDefProvider) iter.next();
MembraneDef[] mdef = mdp.getMembraneDefs();
if( mdef != null ) {
all.addAll(Arrays.asList(mdef));
@@ -76,14 +78,14 @@
* Return the list of additional membrane definition providers which can
be
* specified with the {@link Juliak#CONFIG_PROP_NAME} system property.
*/
- private static List<MembraneDefProvider> getAdditionalMembraneDefs() {
+ private static List getAdditionalMembraneDefs() {
String add = System.getProperty(Juliak.CONFIG_PROP_NAME);
if( add==null || add.length()==0 ) {
return null;
}
- List<MembraneDefProvider> mdps = new
ArrayList<MembraneDefProvider>();
+ List mdps = new ArrayList();
StringTokenizer st = new StringTokenizer(add);
while( st.hasMoreTokens() ) {
String name = st.nextToken();
Index: julia/src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java:1.4
julia/src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java:1.5
--- julia/src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java:1.4
Sat Nov 11 18:17:21 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/MCompositeImpl.java Wed
Dec 20 21:29:35 2006
@@ -62,7 +62,7 @@
// Implementation of the ContentController interface
// -----------------------------------------------------------------
- private List<Component> fcContent = new ArrayList<Component>();
+ private List fcContent = new ArrayList();
public Object[] getFcInternalInterfaces() {
throw new UnsupportedOperationException();
Index: julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.5
julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.6
--- julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.5
Sat Dec 16 20:43:32 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java Wed
Dec 20 21:29:35 2006
@@ -128,7 +128,7 @@
return fcInterfaces.values().toArray();
}
- protected Map<String,Object> fcInterfaces = new HashMap<String,Object>();
+ protected Map fcInterfaces = new HashMap();
// -----------------------------------------------------------------
@@ -136,7 +136,7 @@
// -----------------------------------------------------------------
public String[] listFc() {
- Set<String> names = new HashSet<String>();
+ Set names = new HashSet();
for (Iterator iter = fcInterfaces.entrySet().iterator();
iter.hasNext();) {
Map.Entry entry = (Map.Entry) iter.next();
ComponentInterface itf = (ComponentInterface) entry.getValue();
@@ -163,7 +163,7 @@
// Collection client interfaces
if( fcInterfaces.containsKey("/collection/"+arg0) ) {
- List<Object> bound = new ArrayList<Object>();
+ List bound = new ArrayList();
for (Iterator iter = fcInterfaces.keySet().iterator();
iter.hasNext();) {
String itfName = (String) iter.next();
if( itfName.startsWith(arg0) ) {
@@ -219,7 +219,7 @@
// Implementation of the SuperControllerNotifier interface
// -----------------------------------------------------------------
- protected List<Component> fcSupers = new ArrayList<Component>(1);
+ protected List fcSupers = new ArrayList(1);
public Component[] getFcSuperComponents() {
return (Component[]) fcSupers.toArray(new
Component[fcSupers.size()]);
Index: julia/src/org/objectweb/fractal/juliak/membrane/Membranes.java
diff -u julia/src/org/objectweb/fractal/juliak/membrane/Membranes.java:1.4
julia/src/org/objectweb/fractal/juliak/membrane/Membranes.java:1.5
--- julia/src/org/objectweb/fractal/juliak/membrane/Membranes.java:1.4 Fri
Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/Membranes.java Wed
Dec 20 21:29:35 2006
@@ -50,7 +50,7 @@
// <controller desc, membrane def>
/** Membrane definitions. */
- private Map<Object,MembraneDef> mdefs = new
HashMap<Object,MembraneDef>();
+ private Map mdefs = new HashMap();
/**
Index:
julia/src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java:1.6
julia/src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java:1.7
---
julia/src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java:1.6
Mon Dec 18 22:12:24 2006
+++
julia/src/org/objectweb/fractal/juliak/membrane/backend/MembraneCompiler.java
Wed Dec 20 21:29:36 2006
@@ -132,7 +132,7 @@
prologue(pw,packagename);
prologueMembrane(pw,classname);
- Map<String,Object> context = new HashMap<String,Object>();
+ Map context = new HashMap();
context.put("printwriter",pw);
// Load the composite component corresponding to the control membrane
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.