Mail Archive Home | fractal-commits List | March 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Monday, March 27, 2006 @ 10:33:56
Author: seintur
Path: /cvsroot/fractal/aokell
Added: src/org/objectweb/fractal/aokell/lib/membrane/marker/BaseType.java
Modified:
features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java
features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java
src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java
src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java
Removed: src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java
src/org/objectweb/fractal/aokell/lib/membrane/package.html
Moving BaseType in org.objectweb.fractal.aokell.lib.membrane.marker with all
other marker interfaces.
---------------------------------------------------------------------------------------------------+
features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java
| 2
features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
| 2
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
| 2
src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java
| 51 ----------
src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java
| 2
src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java
| 2
src/org/objectweb/fractal/aokell/lib/membrane/marker/BaseType.java
| 51 ++++++++++
src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java
| 1
src/org/objectweb/fractal/aokell/lib/membrane/package.html
| 32 ------
15 files changed, 56 insertions(+), 95 deletions(-)
Index:
aokell/features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java
diff -u
aokell/features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java:1.1
aokell/features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java:1.2
---
aokell/features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java:1.1
Fri Mar 10 22:04:22 2006
+++
aokell/features/glue/spoon/src/org/objectweb/fractal/aokell/glue/processor/CtrlItfInjectorProcessor.java
Mon Mar 27 10:33:56 2006
@@ -31,7 +31,7 @@
import org.objectweb.fractal.aokell.glue.template.NameControllerTemplate;
import org.objectweb.fractal.aokell.glue.template.SuperControllerTemplate;
import org.objectweb.fractal.aokell.glue.template.TemplateControllerTemplate;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
+import org.objectweb.fractal.aokell.lib.membrane.marker.BaseType;
import org.objectweb.fractal.aokell.lib.membrane.marker.BindingType;
import org.objectweb.fractal.aokell.lib.membrane.marker.ContentType;
import org.objectweb.fractal.aokell.lib.membrane.marker.LifeCycleType;
Index:
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
diff -u
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.6
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.7
---
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.6
Wed Mar 8 20:22:42 2006
+++
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
Mon Mar 27 10:33:56 2006
@@ -50,7 +50,6 @@
import org.objectweb.fractal.aokell.lib.control.name.NameControllerItf;
import org.objectweb.fractal.aokell.lib.control.superc.SuperControllerImpl;
import org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.aokell.lib.membrane.ControllerDef;
import org.objectweb.fractal.aokell.lib.membrane.MembraneDef;
import
org.objectweb.fractal.aokell.lib.membrane.composite.CompositeTemplateType;
@@ -61,6 +60,7 @@
import org.objectweb.fractal.aokell.lib.membrane.flat.FlatType;
import
org.objectweb.fractal.aokell.lib.membrane.flat.ParametricFlatTemplateType;
import org.objectweb.fractal.aokell.lib.membrane.flat.ParametricFlatType;
+import org.objectweb.fractal.aokell.lib.membrane.marker.BaseType;
import
org.objectweb.fractal.aokell.lib.membrane.primitive.ParametricPrimitiveTemplateType;
import
org.objectweb.fractal.aokell.lib.membrane.primitive.ParametricPrimitiveType;
import
org.objectweb.fractal.aokell.lib.membrane.primitive.PrimitiveTemplateType;
Index:
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
diff -u
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.5
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.6
---
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.5
Fri Mar 24 13:04:53 2006
+++
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
Mon Mar 27 10:33:56 2006
@@ -26,9 +26,9 @@
import org.objectweb.fractal.aokell.Membranes;
import org.objectweb.fractal.aokell.lib.control.Controller;
import org.objectweb.fractal.aokell.lib.control.component.ComponentItf;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.aokell.lib.membrane.ControllerDef;
import org.objectweb.fractal.aokell.lib.membrane.MembraneDef;
+import org.objectweb.fractal.aokell.lib.membrane.marker.BaseType;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Type;
import org.objectweb.fractal.api.factory.InstantiationException;
Index: aokell/src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java:1.2
aokell/src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java:removed
--- aokell/src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java:1.2
Thu Mar 23 13:54:16 2006
+++ aokell/src/org/objectweb/fractal/aokell/lib/membrane/BaseType.java Mon
Mar 27 10:33:56 2006
@@ -1,51 +0,0 @@
-/***
- * AOKell
- * Copyright (C) 2005 INRIA, France Telecom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- */
-
-package org.objectweb.fractal.aokell.lib.membrane;
-
-import org.objectweb.fractal.aokell.lib.control.component.ComponentItf;
-import org.objectweb.fractal.api.Component;
-
-
-/**
- * The root interface for all marker types.
- *
- * AOKell marker types act as tags for the glue code. Most of the time there
is
- * one marker type per controller. The glue code for a given controller
selects
- * the classes which implement their associated marker type and performs the
- * transformations needed for this controller.
- *
- * @author Lionel Seinturier <Lionel.Seinturier@xxxxxxx>
- */
-public interface BaseType extends Component {
-
- /**
- * Set the reference towards the component controller.
- */
- public void setFcComponent( ComponentItf fcMembrane );
-
- /**
- * Return the reference of the component controller.
- */
- public ComponentItf getFcComponent();
-}
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplateType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,7 @@
package org.objectweb.fractal.aokell.lib.membrane.flat;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
+import org.objectweb.fractal.aokell.lib.membrane.marker.BaseType;
import org.objectweb.fractal.aokell.lib.membrane.marker.BindingType;
import org.objectweb.fractal.aokell.lib.membrane.marker.NameType;
import org.objectweb.fractal.aokell.lib.membrane.marker.TemplateType;
Index: aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java:1.1
Sat Feb 11 06:43:52 2006
+++ aokell/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,7 @@
package org.objectweb.fractal.aokell.lib.membrane.flat;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
+import org.objectweb.fractal.aokell.lib.membrane.marker.BaseType;
import org.objectweb.fractal.aokell.lib.membrane.marker.BindingType;
import org.objectweb.fractal.aokell.lib.membrane.marker.LifeCycleType;
import org.objectweb.fractal.aokell.lib.membrane.marker.NameType;
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BaseType.java
diff -u /dev/null
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BaseType.java:1.1
--- /dev/null Mon Mar 27 10:33:56 2006
+++ aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BaseType.java
Mon Mar 27 10:33:56 2006
@@ -0,0 +1,51 @@
+/***
+ * AOKell
+ * Copyright (C) 2005 INRIA, France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Contact: Lionel.Seinturier@xxxxxxx
+ *
+ * Author: Lionel Seinturier
+ */
+
+package org.objectweb.fractal.aokell.lib.membrane.marker;
+
+import org.objectweb.fractal.aokell.lib.control.component.ComponentItf;
+import org.objectweb.fractal.api.Component;
+
+
+/**
+ * The root interface for all marker types.
+ *
+ * AOKell marker types act as tags for the glue code. Most of the time there
is
+ * one marker type per controller. The glue code for a given controller
selects
+ * the classes which implement their associated marker type and performs the
+ * transformations needed for this controller.
+ *
+ * @author Lionel Seinturier <Lionel.Seinturier@xxxxxxx>
+ */
+public interface BaseType extends Component {
+
+ /**
+ * Set the reference towards the component controller.
+ */
+ public void setFcComponent( ComponentItf fcMembrane );
+
+ /**
+ * Return the reference of the component controller.
+ */
+ public ComponentItf getFcComponent();
+}
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/BindingType.java
Mon Mar 27 10:33:56 2006
@@ -24,7 +24,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
import
org.objectweb.fractal.aokell.lib.control.binding.BindingControllerSetterGetterItf;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.api.control.BindingController;
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ContentType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.api.control.ContentController;
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/LifeCycleType.java
Mon Mar 27 10:33:56 2006
@@ -24,7 +24,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
import
org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerItf;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
/**
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java:1.1
Sat Feb 11 06:43:53 2006
+++ aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/NameType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.api.control.NameController;
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/ParametricType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
/**
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/SuperType.java
Mon Mar 27 10:33:56 2006
@@ -24,7 +24,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
import org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
/**
Index:
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/membrane/marker/TemplateType.java
Mon Mar 27 10:33:56 2006
@@ -23,7 +23,6 @@
package org.objectweb.fractal.aokell.lib.membrane.marker;
-import org.objectweb.fractal.aokell.lib.membrane.BaseType;
import org.objectweb.fractal.api.factory.Factory;
Index: aokell/src/org/objectweb/fractal/aokell/lib/membrane/package.html
diff -u aokell/src/org/objectweb/fractal/aokell/lib/membrane/package.html:1.1
aokell/src/org/objectweb/fractal/aokell/lib/membrane/package.html:removed
--- aokell/src/org/objectweb/fractal/aokell/lib/membrane/package.html:1.1
Sat Feb 11 06:43:54 2006
+++ aokell/src/org/objectweb/fractal/aokell/lib/membrane/package.html Mon
Mar 27 10:33:56 2006
@@ -1,32 +0,0 @@
-<!--
- * AOKell
- * Copyright (C) 2005 INRIA, France Telecom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- -->
-
-<html>
-<body>
-
-<p>
-This package contains definitions related to control membranes.
-</p>
-
-</body>
-</html>
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.