From: Robert L. <rle...@us...> - 2007-02-12 14:08:35
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679/src/ccmtools/parser/assembly/metamodel Modified Files: Module.java Connection.java Component.java Number.java Constant.java Assembly.java Attribute.java Port.java Value.java QualifiedName.java ModelElement.java AssemblyElement.java Text.java Model.java Log Message: ccm assembly metamodel Index: Component.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Component.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Component.java 5 Feb 2007 15:41:56 -0000 1.1 --- Component.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * defines an inner component + */ public class Component extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- name_ = name; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "component " + idl_name_ + " " + name_ + " ;"); + } } Index: Text.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Text.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Text.java 9 Feb 2007 14:42:13 -0000 1.1 --- Text.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 18,20 **** --- 18,25 ---- value_ = value; } + + public String toString() + { + return "\"" + value_ + "\""; + } } Index: Connection.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Connection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Connection.java 5 Feb 2007 15:41:56 -0000 1.1 --- Connection.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * connects a facet with a receptacle + */ public class Connection extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- receptacle_ = receptacle; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "connect " + facet_ + " to " + receptacle_ + " ;"); + } } Index: AssemblyElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/AssemblyElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssemblyElement.java 5 Feb 2007 15:41:56 -0000 1.1 --- AssemblyElement.java 12 Feb 2007 14:08:31 -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,20 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * One line of an assembly description. + */ public abstract class AssemblyElement { + public abstract void prettyPrint( PrintStream out, String offset ); } Index: Constant.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Constant.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Constant.java 9 Feb 2007 14:42:13 -0000 1.1 --- Constant.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * sets the attribute of an inner component to a constant value + */ public class Constant extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- value_ = value; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "constant " + target_ + " = " + value_ + " ;"); + } } Index: Attribute.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Attribute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Attribute.java 9 Feb 2007 14:42:13 -0000 1.2 --- Attribute.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * connects an attribute of the assembly with the attribute of an inner component + */ public class Attribute extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- source_ = source; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "attribute " + target_ + " = " + source_ + " ;"); + } } Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Model.java 9 Feb 2007 14:42:13 -0000 1.2 --- Model.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,22 **** --- 10,42 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; + /** + * The root element of the ccmtools assembly metamodel. + */ public class Model { private Vector<ModelElement> elements_ = new Vector<ModelElement>(); + /** + * adds a new ModelElement + */ public void add( ModelElement e ) { elements_.add(e); } + + /** + * prints the model to an output stream + * + * @param out the output stream + */ + public void prettyPrint( PrintStream out ) + { + for(int i=0; i<elements_.size(); ++i) + { + elements_.get(i).prettyPrint(out, ""); + } + } } Index: Number.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Number.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Number.java 9 Feb 2007 14:42:13 -0000 1.1 --- Number.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 9, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 9, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,13 **** --- 10,16 ---- package ccmtools.parser.assembly.metamodel; + /** + * a number (integer or floating point) + */ public class Number extends Value { *************** *** 18,20 **** --- 21,28 ---- value_ = value; } + + public String toString() + { + return value_; + } } Index: Value.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Value.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Value.java 9 Feb 2007 14:42:13 -0000 1.1 --- Value.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 9, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 9, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + /** + * defines a constant value for attributs + */ public abstract class Value { + public abstract String toString(); } Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/ModelElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ModelElement.java 5 Feb 2007 15:41:56 -0000 1.1 --- ModelElement.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * Top level element of the model. + */ public abstract class ModelElement { *************** *** 18,20 **** --- 23,27 ---- name_ = name; } + + public abstract void prettyPrint( PrintStream out, String offset ); } Index: QualifiedName.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/QualifiedName.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QualifiedName.java 5 Feb 2007 15:41:56 -0000 1.1 --- QualifiedName.java 12 Feb 2007 14:08:31 -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,28 ---- package ccmtools.parser.assembly.metamodel; + /** + * a qualified name + */ public final class QualifiedName { + private String qn_; + + public QualifiedName( String qn ) + { + qn_ = qn; + } + + public String toString() + { + return qn_; + } } Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Assembly.java 9 Feb 2007 14:42:13 -0000 1.2 --- Assembly.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; *************** *** 24,26 **** --- 25,37 ---- elements_ = elements; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "assembly " + name_ + " implements " + idl_name_ + " {"); + for (int i = 0; i < elements_.size(); ++i) + { + elements_.get(i).prettyPrint(out, offset + " "); + } + out.println(offset + "};"); + } } Index: Port.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Port.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Port.java 9 Feb 2007 14:42:13 -0000 1.2 --- Port.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,16 ---- package ccmtools.parser.assembly.metamodel; + /** + * facet or receptacle + */ public final class Port { *************** *** 38,40 **** --- 41,51 ---- connector_ = connector; } + + public String toString() + { + if (component_ == null) + return "this." + connector_; + else + return component_ + "." + connector_; + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Module.java 9 Feb 2007 14:42:13 -0000 1.2 --- Module.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,15 **** --- 10,19 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; + /** + * a namespace + */ public class Module extends ModelElement { *************** *** 21,23 **** --- 25,37 ---- children_ = children; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "module " + name_ + " {"); + for (int i = 0; i < children_.size(); ++i) + { + children_.get(i).prettyPrint(out, offset + " "); + } + out.println(offset + "};"); + } } |