Menu
▾
▴
[ccmtools-cvs] ccmtools/src/ccmtools/parser/assembly/metamodel Number.java, NONE, 1.1 Constant.java, NONE, 1.1 Value.java, NONE, 1.1 Text.java, NONE, 1.1 Module.java, 1.1, 1.2 Assembly.java, 1.1, 1.2 Attribute.java, 1.1, 1.2 Port.java, 1.1, 1.2 Model.java, 1.1, 1.2 ConstantAttribute.java, 1.1, NONE VariableAttribute.java, 1.1, NONE
|
From: Robert L. <rle...@us...> - 2007-02-09 14:42:21
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18941/src/ccmtools/parser/assembly/metamodel Modified Files: Module.java Assembly.java Attribute.java Port.java Model.java Added Files: Number.java Constant.java Value.java Text.java Removed Files: ConstantAttribute.java VariableAttribute.java Log Message: ccm assembly metamodel --- NEW FILE: Text.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Text.java,v 1.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Text extends Value { private String value_; public Text( String value ) { value_ = value; } } --- NEW FILE: Constant.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Constant.java,v 1.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Constant extends AssemblyElement { private Port target_; private Value value_; public Constant( Port target, Value value ) { target_ = target; value_ = value; } } Index: Attribute.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Attribute.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Attribute.java 5 Feb 2007 15:41:56 -0000 1.1 --- Attribute.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** package ccmtools.parser.assembly.metamodel; ! public abstract class Attribute extends AssemblyElement { } --- 10,23 ---- package ccmtools.parser.assembly.metamodel; ! public class Attribute extends AssemblyElement { + private Port target_; + + private Port source_; + + public Attribute( Port target, Port source ) + { + target_ = target; + source_ = source; + } } Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Model.java 5 Feb 2007 15:41:56 -0000 1.1 --- Model.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,22 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + public class Model { + private Vector<ModelElement> elements_ = new Vector<ModelElement>(); + + public void add( ModelElement e ) + { + elements_.add(e); + } } --- NEW FILE: Number.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Number.java,v 1.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Number extends Value { private String value_; public Number( String value ) { value_ = value; } } --- NEW FILE: Value.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Value.java,v 1.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public abstract class Value { } --- VariableAttribute.java DELETED --- --- ConstantAttribute.java DELETED --- Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Assembly.java 5 Feb 2007 15:41:56 -0000 1.1 --- Assembly.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 10,21 **** package ccmtools.parser.assembly.metamodel; public class Assembly extends ModelElement { private QualifiedName idl_name_; ! public Assembly( String name, QualifiedName idl_name ) { super(name); idl_name_ = idl_name; } } --- 10,26 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + public class Assembly extends ModelElement { private QualifiedName idl_name_; ! private Vector<AssemblyElement> elements_; ! ! public Assembly( String name, QualifiedName idl_name, Vector<AssemblyElement> elements ) { super(name); idl_name_ = idl_name; + elements_ = elements; } } Index: Port.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Port.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Port.java 5 Feb 2007 15:41:56 -0000 1.1 --- Port.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 12,14 **** --- 12,40 ---- public final class Port { + private String component_; + + private String connector_; + + /** + * internal port (port of an inner component) + * + * @param component name of the inner component + * @param connector facet or receptacle name + */ + public Port( String component, String connector ) + { + component_ = component; + connector_ = connector; + } + + /** + * external port (port of the assembly) + * + * @param connector facet or receptacle name + */ + public Port( String connector ) + { + component_ = null; + connector_ = connector; + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Module.java 5 Feb 2007 15:41:56 -0000 1.1 --- Module.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,19 **** package ccmtools.parser.assembly.metamodel; public class Module extends ModelElement { ! public Module( String name ) { super(name); ! // TODO Auto-generated constructor stub } } --- 10,23 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + public class Module extends ModelElement { ! private Vector<ModelElement> children_; ! ! public Module( String name, Vector<ModelElement> children ) { super(name); ! children_ = children; } } |
