Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/META-INF/MANIFEST.MF
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/META-INF/MANIFEST.MF (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/META-INF/MANIFEST.MF (revision 888)
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: no.hib.dpf.examples.smodl
+Bundle-SymbolicName: no.hib.dpf.examples.smodl; singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.jdt.core;bundle-version="3.5.0",
+ org.eclipse.xtend.profiler;resolution:=optional,
+ org.apache.commons.logging,
+ no.hib.dpf.codegen.xpand.ui;bundle-version="1.0.0",
+ org.apache.log4j;resolution:=optional,
+ no.hib.dpf.core;bundle-version="0.1.1",
+ no.hib.dpf.codegen.xpand.metamodel;bundle-version="1.0.0",
+ com.ibm.icu;bundle-version="4.0.1",
+ org.antlr.runtime;bundle-version="3.0.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.emf.mwe.utils;bundle-version="0.7.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.xpand;bundle-version="0.7.0",
+ org.eclipse.xtend;bundle-version="0.7.0",
+ org.eclipse.xtend.typesystem.emf;bundle-version="0.7.0",
+ org.eclipse.xtend.backend;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xtend.middleend.xpand;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xtend.middleend.xtend;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xtend.util.stdlib;bundle-version="1.0.1",
+ org.eclipse.xtend.typesystem.xsd;bundle-version="1.0.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.xmi
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.xmi (revision 886)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.xmi (revision 888)
@@ -3,25 +3,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
@@ -35,32 +35,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -188,4 +160,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.dpf
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.dpf (revision 883)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.dpf (revision 888)
@@ -3,145 +3,169 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+ 170 33
+
+
+
-
-
-
+ 189 96
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+ 186 288
+
+
+
- 237 409
-
-
-
+ 181 350
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
- 744 96
-
-
-
+ 704 112
+
+
+
- 809 324
-
-
-
+ 671 122
+
+
+
-
-
-
+ 549 187
+
+
+
-
-
-
+ 697 232
+
+
+
- 574 330
-
-
-
+
+
+
- 591 398
-
-
-
+ 419 212
+ 420 442
+ 289 443
+
+
+
- 606 416
-
-
-
+ 754 118
+
+
+
- 376 437
- 750 427
-
-
-
+
+
+
- 700 299
-
-
-
+ 737 334
+
+
+
- 433 173
- 425 411
-
-
-
+ 733 369
+ 758 355
+
+
+
- 610 187
-
+ 842 379
+
+
+
+
+
+
+
+
+ 120 410
+
+
+
+
+ 557 340
+
@@ -151,30 +175,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -182,114 +206,107 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+ 508 313
+ 507 25
+
+
+
-
-
-
+ 450 198
+
+
+
- 469 390
- 471 59
-
-
-
+
+
+
- 719 282
- 777 282
- 780 189
- 709 190
-
+ 613 198
+
+
+
+
+
-
-
-
-
- 617 296
-
-
-
+
+
+
-
-
-
+ 693 186
+ 750 184
+ 746 105
+ 682 106
+
+
+
- 292 430
- 292 496
- 369 495
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
@@ -297,17 +314,17 @@
-
+
-
+
-
+
-
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.xmi
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.xmi (revision 883)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/RepositoryService.xmi (revision 888)
@@ -2,68 +2,73 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -74,13 +79,41 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,55 +121,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -144,64 +135,50 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -217,5 +194,5 @@
-
+
@@ -228,11 +205,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.dpf
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.dpf (revision 886)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.dpf (revision 888)
@@ -3,20 +3,20 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -24,9 +24,9 @@
-
+
-
+
@@ -36,5 +36,5 @@
-
+
@@ -44,9 +44,9 @@
-
+
-
+
508 313
@@ -54,19 +54,19 @@
-
+
450 198
-
+
-
+
613 198
-
+
@@ -76,5 +76,5 @@
-
+
693 186
@@ -84,5 +84,5 @@
-
+
@@ -95,51 +95,46 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.project
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.project (revision 883)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.project (revision 888)
@@ -6,7 +6,30 @@
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+ org.eclipse.xtend.shared.ui.xtendBuilder
+
+
+
- no.hib.dpf.api.wizards.projectwizard.dpfprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.pde.PluginNature
+ org.eclipse.xtend.shared.ui.xtendXPandNature
+ no.hib.dpf.codegen.xpand.ui.nature.dpfmetamodelnature
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/workflow/workflow.mwe
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/workflow/workflow.mwe (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/workflow/workflow.mwe (revision 888)
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/Smodl.xpt
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/Smodl.xpt (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/Smodl.xpt (revision 888)
@@ -0,0 +1,72 @@
+«IMPORT dpf»
+
+«EXTENSION org::eclipse::xtend::util::stdlib::io»
+«EXTENSION template::smodlWrapper»
+
+«DEFINE main FOR dpf::Specification»
+ «EXPAND graph FOR this.graph»
+«ENDDEFINE»
+
+«DEFINE graph FOR dpf::Graph»
+ «EXPAND service FOREACH this.getServices()»
+«ENDDEFINE»
+
+
+«DEFINE service FOR dpf::Service»
+ «FILE this.name+".xml"»
+
+
+
+ «EXPAND servicedoc FOREACH this.getAServiceDocs()»
+ «EXPAND methodref FOREACH this.getAMethodRefs()»
+ «EXPAND struct FOREACH this.getAStructRefs()»
+
+ «ENDFILE»
+ «syserr(this.name)»
+«ENDDEFINE»
+
+«DEFINE servicedoc FOR dpf::serviceDoc»
+ «this.target.name»
+«ENDDEFINE»
+
+«DEFINE methodref FOR dpf::methodRef»
+
+ «EXPAND methodDoc FOREACH this.target.getAMethodDocs()»
+ «EXPAND firstargref FOREACH this.target.getAFirstArgs()»
+
+
+«ENDDEFINE»
+
+«DEFINE methodDoc FOR dpf::methodDoc»
+ «this.target.name»
+«ENDDEFINE»
+
+«DEFINE firstargref FOR dpf::firstArg»
+
+ «EXPAND nextArg FOREACH this.target.getANextArgs()»
+
+«ENDDEFINE»
+
+«DEFINE nextArg FOR dpf::nextArg»
+ «nextArgRecursion(this)»
+ «REM»«setNextArg(this)»
+ «ENDREM»
+
+«ENDDEFINE»
+
+«DEFINE struct FOR dpf::structRef»
+
+
+ «EXPAND structDoc FOREACH this.target.getAStructDocs()»
+ «EXPAND field FOREACH this.target.getAFieldRefs()»
+
+«ENDDEFINE»
+
+«DEFINE structDoc FOR dpf::structDoc»
+ «this.target.name»
+«ENDDEFINE»
+
+«DEFINE field FOR dpf::fieldRef»
+
+«ENDDEFINE»
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/smodlWrapper.ext
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/smodlWrapper.ext (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src/template/smodlWrapper.ext (revision 888)
@@ -0,0 +1,47 @@
+import dpf;
+extension org::eclipse::xtend::util::stdlib::io;
+
+
+setQuotes(String strName):
+ "\""+strName+"\"";
+
+
+setArgType(dpf::Arg this):
+ this.getAArgStructs().size>0?this.getAArgStructs().first().target.name:
+ (this.getAArgTypes().size>0?this.getAArgTypes().first().target.name:"");
+
+
+
+setMethodResult(dpf::Method this):
+ this.getAStructResults().size>0?this.getAStructResults().first().target.name:
+ (this.getASimpleResults().size>0?this.getASimpleResults().first().target.name:"");
+
+
+
+setNextArg(dpf::nextArg this):
+ "";
+
+String nextArgRecursion(dpf::nextArg this): this.target.getANextArgs().size>0 ?
+ setNextArg(this)+" "+nextArgRecursion(this.target.getANextArgs().first()):
+ setNextArg(this) ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.core.resources.prefs
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.core.resources.prefs (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.core.resources.prefs (revision 888)
@@ -0,0 +1,7 @@
+#Sat Apr 28 10:53:57 CEST 2012
+eclipse.preferences.version=1
+encoding//.settings/no.hib.dpf.codegen.xpand.ui.prefs=Cp1252
+encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
+encoding//src/template/templ.xpt=Cp1252
+encoding//src/workflow/workflow.mwe=Cp1252
+encoding/=UTF-8
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.xtend.shared.ui.prefs
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.xtend.shared.ui.prefs (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/org.eclipse.xtend.shared.ui.prefs (revision 888)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+project.specific.metamodel=true
+metamodelContributor=no.hib.dpf.codegen.xpand.ui.DpfMetaModelContributor
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/no.hib.dpf.codegen.xpand.ui.prefs
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/no.hib.dpf.codegen.xpand.ui.prefs (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/.settings/no.hib.dpf.codegen.xpand.ui.prefs (revision 888)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+metamodel.location=platform:/resource/no.hib.dpf.examples.smodl/specifications/SmodlMetaModel.xmi
Index: /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src-gen/repositoryService.xml
===================================================================
--- /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src-gen/repositoryService.xml (revision 888)
+++ /dpf-model-editor/trunk/examples/no.hib.dpf.examples.smodl/src-gen/repositoryService.xml (revision 888)
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+