[Smartfrog-checkins] SF.net SVN: smartfrog: [6669] trunk/core/extras/AuthoringTool

[<kum...@us...>]

Revision: 6669
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6669&view=rev
Author:   kumaravelg
Date:     2008-06-09 17:03:18 -0700 (Mon, 09 Jun 2008)

Log Message:
-----------
updated metamodel

Modified Paths:
--------------
    trunk/core/extras/AuthoringTool/Smartfrog.ecore
    trunk/core/extras/AuthoringTool/Smartfrog.genmodel

Modified: trunk/core/extras/AuthoringTool/Smartfrog.ecore
===================================================================
--- trunk/core/extras/AuthoringTool/Smartfrog.ecore	2008-06-10 00:02:44 UTC (rev 6668)
+++ trunk/core/extras/AuthoringTool/Smartfrog.ecore	2008-06-10 00:03:18 UTC (rev 6669)
@@ -82,11 +82,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="Comps" upperBound="1"
         eType="#//DependencyModel" containment="false"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="Depends_By" lowerBound="0" upperBound="2147483647"
-        eType="#//Component" />
+        eType="#//SimpleDependencyConnection" />
       <eStructuralFeatures xsi:type="ecore:EReference" name="By" lowerBound="0" upperBound="2147483647"
         eType="#//Connectors" />
       <eStructuralFeatures xsi:type="ecore:EReference" name="DependOn" lowerBound="1" upperBound="1"
-        eType="#//Component" />
+        eType="#//SimpleDependencyConnection" />
       <eStructuralFeatures xsi:type="ecore:EReference" name="On" lowerBound="0" upperBound="2147483647"
         eType="#//Connectors" />
   </eClassifiers>
@@ -119,10 +119,16 @@
 
      
  <eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="#//ModelObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Attri_Name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="0"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="StateData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="StateListen" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="StateNotify" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="IsLazyValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Attributes" upperBound="1"
         eType="#//Component" containment="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="Composite_arrtibutes" upperBound="1"
@@ -145,6 +151,10 @@
  <eClassifiers xsi:type="ecore:EClass" name="SimpleDependencyConnection">
  	 <eStructuralFeatures xsi:type="ecore:EReference" name="Source" eType="#//Component"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="Target" eType="#//Component"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Relevant" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="0"/>
   </eClassifiers>
 
      

Modified: trunk/core/extras/AuthoringTool/Smartfrog.genmodel
===================================================================
--- trunk/core/extras/AuthoringTool/Smartfrog.genmodel	2008-06-10 00:02:44 UTC (rev 6668)
+++ trunk/core/extras/AuthoringTool/Smartfrog.genmodel	2008-06-10 00:03:18 UTC (rev 6669)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/Auth_tool_builder1/src"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/Auth_tool_builder/src"
     modelName="Smartfrog" copyrightFields="false">
-  <foreignModel>C:/office_research/smartfrog/Auth_tool/workspace/Auth_tool_builder1/Smartfrog.ecore</foreignModel>
+  <foreignModel>C:/office_research/smartfrog/Auth_tool/workspace/Auth_tool_builder/Smartfrog.ecore</foreignModel>
   <genPackages prefix="Smartfrog"  basePackage=""  disposableProviderFactory="true"
       ecorePackage="Smartfrog.ecore#/">
     <genClasses ecoreClass="Smartfrog.ecore#//MementoValue">
@@ -65,8 +65,11 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//DependencyModel/RootModel"/>
     </genClasses>
     <genClasses ecoreClass="Smartfrog.ecore#//Attribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/Attri_Name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/Value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/StateData"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/StateListen"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/StateNotify"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//Attribute/IsLazyValue"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//Attribute/Attributes"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//Attribute/Composite_arrtibutes"/>
     </genClasses>
@@ -79,6 +82,8 @@
     <genClasses ecoreClass="Smartfrog.ecore#//SimpleDependencyConnection">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//SimpleDependencyConnection/Source"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//SimpleDependencyConnection/Target"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//SimpleDependencyConnection/Relevant"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Smartfrog.ecore#//SimpleDependencyConnection/Enabled"/>
     </genClasses>
     <genClasses ecoreClass="Smartfrog.ecore#//InputDependencyConnection">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Smartfrog.ecore#//InputDependencyConnection/Source"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.